diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ca9d9a1..419d50a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,8 +19,10 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Login to Dockerhub - run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin + - name: Login to Docker & GHCR + run: | + echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin + #echo "${{ secrets.GHCR_PASSWORD }}" | docker login ghcr.io -u "${{ secrets.GHCR_USERNAME }}" --password-stdin - name: Setup building file structure run: | @@ -35,12 +37,9 @@ jobs: --build-arg VERSION=${{ github.event.release.tag_name }} \ --provenance=false \ --platform linux/amd64,linux/arm64 \ - --tag zoraxydocker/zoraxy:${{ github.event.release.tag_name }} \ - . - - docker buildx build --push \ - --build-arg VERSION=${{ github.event.release.tag_name }} \ - --provenance=false \ - --platform linux/amd64,linux/arm64 \ - --tag zoraxydocker/zoraxy:latest \ + --tag ${{ secrets.DOCKER_USERNAME }}/zoraxy:${{ github.event.release.tag_name }} \ + --tag ${{ secrets.DOCKER_USERNAME }}/zoraxy:latest \ + # Since this is still undetermined, I will leave it commented + #--tag ghcr.io/${{ secrets.GHCR_USERNAME }}/zoraxy:${{ steps.get_latest_release_tag.outputs.latest_tag }} \ + #--tag ghcr.io/${{ secrets.GHCR_USERNAME }}/zoraxy:latest \ . diff --git a/docker/Dockerfile b/docker/Dockerfile index 8ffd402..eb2b15b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,6 +3,8 @@ FROM docker.io/golang:alpine ARG VERSION RUN apk add --no-cache bash netcat-openbsd sudo +# Alternatives for security +RUN apk add --no-cache openssl=3.1.4-r1 RUN mkdir -p /opt/zoraxy/source/ &&\ mkdir -p /opt/zoraxy/config/ &&\ diff --git a/docker/README.md b/docker/README.md index beaaea4..42cdd14 100644 --- a/docker/README.md +++ b/docker/README.md @@ -39,7 +39,7 @@ services: | `-p (ports)` | Yes | Depending on how your network is setup, you may need to portforward 80, 443, and the management port. | | `-v (path to storage directory):/opt/zoraxy/config/` | Recommend | Sets the folder that holds your files. This should be the place you just chose. By default, it will create a Docker volume for the files for persistency but they will not be accessible. | | `-e ARGS='(your arguments)'` | No | Sets the arguments to run Zoraxy with. Enter them as you would normally. By default, it is ran with `-noauth=false` but you cannot change the management port. This is required for the healthcheck to work. | -| `zoraxydocker/zoraxy:latest` | Yes | The repository on Docker hub. By default, it is the latest version that I have published. | +| `zoraxydocker/zoraxy:latest` | Yes | The repository on Docker hub. By default, it is the latest version that is published. | ## Examples:
### Docker Run