Skip to content
Merged

Dev #17

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- name: Get Docker tags for Debian based image
id: docker_meta_debian
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: |
neilpang/letsproxy
Expand All @@ -26,20 +26,20 @@ jobs:
type=ref,event=branch

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Login to DockerHub
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push the Debian based image
id: docker_build_debian
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
file: Dockerfile
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/s390x
Expand All @@ -61,7 +61,7 @@ jobs:

- name: Get Docker tags for Alpine based image
id: docker_meta_alpine
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: |
neilpang/letsproxy
Expand All @@ -71,20 +71,20 @@ jobs:
flavor: latest=false

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Login to DockerHub
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push the Alpine based image
id: docker_build_alpine
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
file: Dockerfile.alpine
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/s390x
Expand Down
3 changes: 3 additions & 0 deletions updatessl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ updatessl() {
if grep ACME_DOMAINS $DEFAULT_CONF ; then
for d_list in $(grep ACME_DOMAINS $DEFAULT_CONF | cut -d ' ' -f 2);
do
if echo "$d_list" | grep '*'; then
continue;
fi
Comment on lines +18 to +20
d=$(echo "$d_list" | cut -d , -f 1)
$ACME_BIN --issue --server letsencrypt -k ec-256 \
-d $d_list \
Expand Down