From ec46ead4b36a0f41780e6e5a821d1eca86fdd698 Mon Sep 17 00:00:00 2001 From: tehniemer Date: Sat, 28 Apr 2018 09:56:23 -0500 Subject: [PATCH 01/14] Update Dockerfile --- php/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/php/Dockerfile b/php/Dockerfile index b635f72b..999449ca 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -4,7 +4,7 @@ FROM abiosoft/caddy:builder as builder ARG version="0.10.14" -ARG plugins="git" +ARG plugins="git,reauth" # process wrapper RUN go get -v github.com/abiosoft/parent @@ -55,8 +55,8 @@ EXPOSE 80 443 2015 VOLUME /root/.caddy /srv WORKDIR /srv -COPY Caddyfile /etc/Caddyfile -COPY index.php /srv/index.php +#COPY Caddyfile /etc/Caddyfile +#COPY index.php /srv/index.php # install process wrapper COPY --from=builder /go/bin/parent /bin/parent From 800ed7862dd96b7e897aad2baeae769e8c41cb35 Mon Sep 17 00:00:00 2001 From: tehniemer Date: Sat, 28 Apr 2018 10:53:52 -0500 Subject: [PATCH 02/14] Update Dockerfile --- php/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php/Dockerfile b/php/Dockerfile index 999449ca..1810a704 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -55,8 +55,8 @@ EXPOSE 80 443 2015 VOLUME /root/.caddy /srv WORKDIR /srv -#COPY Caddyfile /etc/Caddyfile -#COPY index.php /srv/index.php +COPY Caddyfile /etc/Caddyfile +COPY index.php /srv/index.php # install process wrapper COPY --from=builder /go/bin/parent /bin/parent From 1f434788e3221cad353e4a2ff5b3c5f350c58789 Mon Sep 17 00:00:00 2001 From: tehniemer Date: Wed, 19 Dec 2018 18:18:06 -0600 Subject: [PATCH 03/14] Update Dockerfile --- php/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/php/Dockerfile b/php/Dockerfile index d2d00fd2..c51c0d56 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -3,8 +3,8 @@ # FROM abiosoft/caddy:builder as builder -ARG version="0.11.0" -ARG plugins="git,filemanager,cors,realip,expires,cache,reauth" +ARG version="0.11.1" +ARG plugins="git,cors,realip,expires,cache,reauth" # process wrapper RUN go get -v github.com/abiosoft/parent @@ -17,7 +17,7 @@ RUN VERSION=${version} PLUGINS=${plugins} /bin/sh /usr/bin/builder.sh FROM alpine:3.8 LABEL maintainer "Abiola Ibrahim " -ARG version="0.11.0" +ARG version="0.11.1" LABEL caddy_version="$version" # Let's Encrypt Agreement @@ -63,4 +63,3 @@ COPY --from=builder /go/bin/parent /bin/parent ENTRYPOINT ["/bin/parent", "caddy"] CMD ["--conf", "/etc/Caddyfile", "--log", "stdout", "--agree=$ACME_AGREE"] - From 5cd2e04c0ebaa472c2d15b3b3af74faf45b5078a Mon Sep 17 00:00:00 2001 From: tehniemer Date: Wed, 19 Dec 2018 19:04:57 -0600 Subject: [PATCH 04/14] Update Dockerfile --- php/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/php/Dockerfile b/php/Dockerfile index 54d89ed8..c51c0d56 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -4,7 +4,7 @@ FROM abiosoft/caddy:builder as builder ARG version="0.11.1" -ARG plugins="git,cors,realip,expires,cache" +ARG plugins="git,cors,realip,expires,cache,reauth" # process wrapper RUN go get -v github.com/abiosoft/parent @@ -63,4 +63,3 @@ COPY --from=builder /go/bin/parent /bin/parent ENTRYPOINT ["/bin/parent", "caddy"] CMD ["--conf", "/etc/Caddyfile", "--log", "stdout", "--agree=$ACME_AGREE"] - From 8a822c6b83763924eec31d4393985d3b0d851f8a Mon Sep 17 00:00:00 2001 From: tehniemer Date: Sun, 13 Jan 2019 12:16:42 -0600 Subject: [PATCH 05/14] Update Dockerfile added net plugin --- php/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/Dockerfile b/php/Dockerfile index c51c0d56..557fca2b 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -4,7 +4,7 @@ FROM abiosoft/caddy:builder as builder ARG version="0.11.1" -ARG plugins="git,cors,realip,expires,cache,reauth" +ARG plugins="git,cors,realip,expires,cache,reauth,net" # process wrapper RUN go get -v github.com/abiosoft/parent From ef99e911dd07fbf08ecd8d0116d13148038fbe96 Mon Sep 17 00:00:00 2001 From: tehniemer Date: Sun, 13 Jan 2019 16:10:46 -0600 Subject: [PATCH 06/14] Remove net plugin it done broke it. --- php/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/Dockerfile b/php/Dockerfile index 557fca2b..c51c0d56 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -4,7 +4,7 @@ FROM abiosoft/caddy:builder as builder ARG version="0.11.1" -ARG plugins="git,cors,realip,expires,cache,reauth,net" +ARG plugins="git,cors,realip,expires,cache,reauth" # process wrapper RUN go get -v github.com/abiosoft/parent From 450c0402ff92eb20f1b318841e20fa85941c9cfd Mon Sep 17 00:00:00 2001 From: tehniemer Date: Sun, 13 Jan 2019 16:54:29 -0600 Subject: [PATCH 07/14] Update Dockerfile --- php/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/php/Dockerfile b/php/Dockerfile index c51c0d56..a4e85894 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -63,3 +63,4 @@ COPY --from=builder /go/bin/parent /bin/parent ENTRYPOINT ["/bin/parent", "caddy"] CMD ["--conf", "/etc/Caddyfile", "--log", "stdout", "--agree=$ACME_AGREE"] +- From 3e41f29c9414e2ea6d1d5af0451d57630486e450 Mon Sep 17 00:00:00 2001 From: tehniemer Date: Sun, 13 Jan 2019 16:55:11 -0600 Subject: [PATCH 08/14] Update Dockerfile --- php/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/php/Dockerfile b/php/Dockerfile index a4e85894..c51c0d56 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -63,4 +63,3 @@ COPY --from=builder /go/bin/parent /bin/parent ENTRYPOINT ["/bin/parent", "caddy"] CMD ["--conf", "/etc/Caddyfile", "--log", "stdout", "--agree=$ACME_AGREE"] -- From 3497b59349e7e85badbeb437365387174bfb1a2c Mon Sep 17 00:00:00 2001 From: tehniemer Date: Tue, 21 Dec 2021 11:29:25 -0600 Subject: [PATCH 09/14] Create docker-image.yml --- .github/workflows/docker-image.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 00000000..2bc69ca5 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,29 @@ +name: Docker Image CI + +on: + push: + branches: [ release ] + pull_request: + branches: [ release ] + workflow_dispatch: + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Docker Login + env: + DOCKER_USER: ${{secrets.DOCKER_USER}} + DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} + run: | + docker login -u $DOCKER_USER -p $DOCKER_PASSWORD + + - name: Build the Docker image + run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) + + - name: Docker Push + run: docker pusch ${{secrets.DOCKER_USER}}/caddyreauth From e774af45d1aa19670acf1c18a281ea78516001c1 Mon Sep 17 00:00:00 2001 From: tehniemer Date: Tue, 21 Dec 2021 11:45:40 -0600 Subject: [PATCH 10/14] Update docker-image.yml --- .github/workflows/docker-image.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 2bc69ca5..725c901e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -5,7 +5,6 @@ on: branches: [ release ] pull_request: branches: [ release ] - workflow_dispatch: jobs: From fd3b8acfd95976d1359433cd9a94ce82165e8cc5 Mon Sep 17 00:00:00 2001 From: tehniemer Date: Tue, 21 Dec 2021 13:53:30 -0600 Subject: [PATCH 11/14] Update docker-image.yml --- .github/workflows/docker-image.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 725c901e..4a0b9d0a 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -2,9 +2,9 @@ name: Docker Image CI on: push: - branches: [ release ] + branches: [ master ] pull_request: - branches: [ release ] + branches: [ master ] jobs: @@ -25,4 +25,4 @@ jobs: run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) - name: Docker Push - run: docker pusch ${{secrets.DOCKER_USER}}/caddyreauth + run: docker push ${{secrets.DOCKER_USER}}/caddyreauth From cef3ac49a263196075989a34fcabdd6c58137153 Mon Sep 17 00:00:00 2001 From: tehniemer Date: Tue, 21 Dec 2021 13:57:30 -0600 Subject: [PATCH 12/14] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 4a0b9d0a..2ec338f4 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -25,4 +25,4 @@ jobs: run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) - name: Docker Push - run: docker push ${{secrets.DOCKER_USER}}/caddyreauth + run: docker push $DOCKER_USER/caddyreauth From 75c4bfac4b66c0e070acabfdad5fd4eefd5da24c Mon Sep 17 00:00:00 2001 From: tehniemer Date: Tue, 21 Dec 2021 14:12:13 -0600 Subject: [PATCH 13/14] Update docker-image.yml --- .github/workflows/docker-image.yml | 38 +++++++++++++++++------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 2ec338f4..689ba953 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -7,22 +7,28 @@ on: branches: [ master ] jobs: + build-container: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 - build: + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USER }} + password: ${{ secrets.DOCKER_PASSWORD }} - runs-on: ubuntu-latest + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v3 + with: + images: tehniemer/caddyreauth - steps: - - uses: actions/checkout@v2 - - name: Docker Login - env: - DOCKER_USER: ${{secrets.DOCKER_USER}} - DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} - run: | - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD - - - name: Build the Docker image - run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) - - - name: Docker Push - run: docker push $DOCKER_USER/caddyreauth + - name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + push: true + #tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From d68c7839b7c1a11d267dc2e80d331ddea707b19c Mon Sep 17 00:00:00 2001 From: tehniemer Date: Tue, 21 Dec 2021 14:13:16 -0600 Subject: [PATCH 14/14] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 689ba953..b0184eea 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -30,5 +30,5 @@ jobs: with: context: . push: true - #tags: ${{ steps.meta.outputs.tags }} + tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }}