diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 964f3f6..20b06c3 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -16,10 +16,6 @@ on: branches: [ main ] env: - # Use docker.io for Docker Hub if empty - REGISTRY: ghcr.io - # github.repository as / - IMAGE_NAME: ${{ github.repository_owner }}/openssl PLATFORMS: linux/amd64,linux/arm64 jobs: @@ -34,23 +30,30 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - # Login against a Docker registry except on PR - # https://github.com/docker/login-action - - name: Log into registry ${{ env.REGISTRY }} + - name: Log into registry GitHub Container registry if: github.event_name != 'pull_request' uses: docker/login-action@v1 with: - registry: ${{ env.REGISTRY }} + registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Log into registry Docker Hub registry + if: github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + # Extract metadata (tags, labels) for Docker # https://github.com/docker/metadata-action - name: Extract Docker metadata id: meta uses: docker/metadata-action@v3 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: | + ${{ github.repository_owner }}/openssl + ${{ secrets.DOCKERHUB_USERNAME }}/openssl - name: Set up QEMU uses: docker/setup-qemu-action@v1 diff --git a/README.md b/README.md index f284d45..0266397 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ A simple openssl Docker image. -Find Docker image at https://github.com/aslafy-z/docker-openssl/pkgs/container/openssl. +Find Docker image published at and .