From df9674d27b4cb70b908770eef27a2672f5e43be5 Mon Sep 17 00:00:00 2001 From: Matthieu BARGHEON Date: Thu, 3 Mar 2022 10:54:41 +0100 Subject: [PATCH 1/5] Create publish-image.yml --- .github/workflows/publish-image.yml | 49 +++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/publish-image.yml diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml new file mode 100644 index 0000000..59ce907 --- /dev/null +++ b/.github/workflows/publish-image.yml @@ -0,0 +1,49 @@ +name: Publish Docker image + +on: + push: + branches: + - main + - release + - develop + tags: + - 'v*' + paths-ignore: + - '*.md' + +jobs: + push_to_registry: + name: Push Docker image to GitHub Container Registry + runs-on: ubuntu-latest + steps: + - name: Check out the repo + uses: actions/checkout@v2 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v3 + with: + images: ghcr.io/${{ github.repository }} + tags: | + type=ref,event=branch + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern=v{{major}} + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - uses: docker/build-push-action@v2 + with: + context: . + file: Dockerfile + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From 70507474455018f610c37b6c3add726c5e94a994 Mon Sep 17 00:00:00 2001 From: Matthieu BARGHEON Date: Thu, 3 Mar 2022 10:55:23 +0100 Subject: [PATCH 2/5] Update Dockerfile --- Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7989270..003f0d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ #Stage 1 : builder debian image -FROM debian:buster as builder +FROM debian:bullseye as builder # properly setup debian sources ENV DEBIAN_FRONTEND noninteractive -RUN echo "deb http://http.debian.net/debian buster main\n\ -deb-src http://http.debian.net/debian buster main\n\ -deb http://http.debian.net/debian buster-updates main\n\ -deb-src http://http.debian.net/debian buster-updates main\n\ -deb http://security.debian.org buster/updates main\n\ -deb-src http://security.debian.org buster/updates main\n\ +RUN echo "deb http://http.debian.net/debian bullseye main\n\ +deb-src http://http.debian.net/debian bullseye main\n\ +deb http://http.debian.net/debian bullseye-updates main\n\ +deb-src http://http.debian.net/debian bullseye-updates main\n\ +deb http://security.debian.org bullseye/updates main\n\ +deb-src http://security.debian.org bullseye/updates main\n\ " > /etc/apt/sources.list # install package building helpers @@ -29,7 +29,7 @@ RUN mkdir /tmp/pure-ftpd/ && \ #Stage 2 : actual pure-ftpd image -FROM debian:buster-slim +FROM debian:bullseye-slim # feel free to change this ;) LABEL maintainer "Andrew Stilliard " From 42205ada357a12a959c89d1b61923407215ff9ff Mon Sep 17 00:00:00 2001 From: Matthieu BARGHEON Date: Thu, 3 Mar 2022 15:03:01 +0100 Subject: [PATCH 3/5] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 003f0d4..6131a35 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,8 @@ RUN echo "deb http://http.debian.net/debian bullseye main\n\ deb-src http://http.debian.net/debian bullseye main\n\ deb http://http.debian.net/debian bullseye-updates main\n\ deb-src http://http.debian.net/debian bullseye-updates main\n\ -deb http://security.debian.org bullseye/updates main\n\ -deb-src http://security.debian.org bullseye/updates main\n\ +deb http://security.debian.org/debian-security/ bullseye-security main\n\ +deb-src http://security.debian.org/debian-security/ bullseye-security main\n\ " > /etc/apt/sources.list # install package building helpers From 0f9b0dd6c9e1bb9a51d638cc317f9e7e522f1780 Mon Sep 17 00:00:00 2001 From: Matthieu BARGHEON Date: Mon, 7 Mar 2022 09:12:50 +0100 Subject: [PATCH 4/5] Add dependancy libsodium23 --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6131a35..aa934a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,13 +41,14 @@ RUN apt-get -y update && \ apt-get --no-install-recommends --yes install \ libc6 \ libcap2 \ - libmariadb3 \ + libmariadb3 \ libpam0g \ libssl1.1 \ - lsb-base \ - openbsd-inetd \ - openssl \ - perl \ + libsodium23 \ + lsb-base \ + openbsd-inetd \ + openssl \ + perl \ rsyslog COPY --from=builder /tmp/pure-ftpd/*.deb /tmp/pure-ftpd/ From b4e61924f76752b224ba80db8f754243fc2825b6 Mon Sep 17 00:00:00 2001 From: Matthieu BARGHEON Date: Mon, 14 Mar 2022 18:03:40 +0100 Subject: [PATCH 5/5] Delete .github/workflows directory --- .github/workflows/publish-image.yml | 49 ----------------------------- 1 file changed, 49 deletions(-) delete mode 100644 .github/workflows/publish-image.yml diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml deleted file mode 100644 index 59ce907..0000000 --- a/.github/workflows/publish-image.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: Publish Docker image - -on: - push: - branches: - - main - - release - - develop - tags: - - 'v*' - paths-ignore: - - '*.md' - -jobs: - push_to_registry: - name: Push Docker image to GitHub Container Registry - runs-on: ubuntu-latest - steps: - - name: Check out the repo - uses: actions/checkout@v2 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v3 - with: - images: ghcr.io/${{ github.repository }} - tags: | - type=ref,event=branch - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern=v{{major}} - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to Registry - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - uses: docker/build-push-action@v2 - with: - context: . - file: Dockerfile - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }}