Skip to content
Merged
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
38 changes: 20 additions & 18 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ env:
MAIN_VERSION: "3.0"
STABLE_VERSION: "2.28"
MAINTENANCE_VERSION: "2.27"
# Primary registry: pushed to during build, receives personal account credentials
PRIMARY_REGISTRY: "petersmythe/geoserver-test"
# Secondary registry: mirrored after build, receives OSGeo credentials
SECONDARY_REGISTRY: "geoserver-docker.osgeo.org/geoserver"
# Primary registry: pushed to during build, receives OSGeo credentials
PRIMARY_REGISTRY: "geoserver-docker.osgeo.org/geoserver"
# Secondary registry: mirrored after build, receives personal account credentials, for docker scout analysis
SECONDARY_REGISTRY: "petersmythe/geoserver-test"

jobs:
# ============================================================
Expand Down Expand Up @@ -276,11 +276,12 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to Primary Registry (Docker Hub)
- name: Login to Primary Registry (OSGeo)
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
registry: geoserver-docker.osgeo.org
username: ${{ secrets.OSGEO_REPO_USERNAME }}
password: ${{ secrets.OSGEO_REPO_PASSWORD }}

- name: Download GeoServer WAR
run: |
Expand Down Expand Up @@ -351,11 +352,12 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to Primary Registry (Docker Hub)
- name: Login to Primary Registry (OSGeo)
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
registry: geoserver-docker.osgeo.org
username: ${{ secrets.OSGEO_REPO_USERNAME }}
password: ${{ secrets.OSGEO_REPO_PASSWORD }}

- name: Create manifest list and push to Primary Registry (no GDAL)
working-directory: /tmp/digests-nogdal
Expand Down Expand Up @@ -442,28 +444,29 @@ jobs:
### Images Created

#### Without GDAL
- Primary: [${{ env.PRIMARY_REGISTRY }}:${{ needs.prepare.outputs.primary_tag }}](https://hub.docker.com/r/${{ env.PRIMARY_REGISTRY }}/tags)
EOF

echo "- Primary: ${{ env.PRIMARY_REGISTRY }}:${{ needs.prepare.outputs.primary_tag }}" >> $GITHUB_STEP_SUMMARY

# Add additional tags if present
ADDITIONAL_TAGS="${{ needs.prepare.outputs.additional_tags }}"
if [ -n "$ADDITIONAL_TAGS" ]; then
IFS=',' read -ra TAG_ARRAY <<< "$ADDITIONAL_TAGS"
for tag in "${TAG_ARRAY[@]}"; do
echo "- Additional: [${{ env.PRIMARY_REGISTRY }}:$tag](https://hub.docker.com/r/${{ env.PRIMARY_REGISTRY }}/tags)" >> $GITHUB_STEP_SUMMARY
echo "- Additional: ${{ env.PRIMARY_REGISTRY }}:$tag" >> $GITHUB_STEP_SUMMARY
done
fi

cat >> $GITHUB_STEP_SUMMARY << 'EOF'

#### With GDAL
- Primary: [${{ env.PRIMARY_REGISTRY }}:${{ needs.prepare.outputs.primary_tag }}-gdal](https://hub.docker.com/r/${{ env.PRIMARY_REGISTRY }}/tags)
- Primary: ${{ env.PRIMARY_REGISTRY }}:${{ needs.prepare.outputs.primary_tag }}-gdal
EOF

if [ -n "$ADDITIONAL_TAGS" ]; then
IFS=',' read -ra TAG_ARRAY <<< "$ADDITIONAL_TAGS"
for tag in "${TAG_ARRAY[@]}"; do
echo "- Additional: [${{ env.PRIMARY_REGISTRY }}:$tag-gdal](https://hub.docker.com/r/${{ env.PRIMARY_REGISTRY }}/tags)" >> $GITHUB_STEP_SUMMARY
echo "- Additional: ${{ env.PRIMARY_REGISTRY }}:$tag-gdal" >> $GITHUB_STEP_SUMMARY
done
fi

Expand Down Expand Up @@ -498,12 +501,11 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to Secondary Registry (OSGeo)
- name: Login to Secondary Registry (Docker Hub)
uses: docker/login-action@v3
with:
registry: geoserver-docker.osgeo.org
username: ${{ secrets.OSGEO_REPO_USERNAME }}
password: ${{ secrets.OSGEO_REPO_PASSWORD }}
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Copy multi-arch manifests to secondary registry
run: |
Expand Down