Skip to content

Commit

Permalink
Update actions
Browse files Browse the repository at this point in the history
  • Loading branch information
mjanez authored Mar 20, 2024
1 parent 6dcaef7 commit bfdd2f8
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 40 deletions.
16 changes: 2 additions & 14 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ on:
branches:
- master
- 'ckan-*.*.*'
- '!ckan-main'
- '!dev/ckan-*.*.*'
- '!feature/*'
- '!fix/*'

env:
REGISTRY: ghcr.io
IMAGE_NAME: mjanez/ckan-docker
TAG: ghcr.io/mjanez/ckan-docker:${{ github.head_ref }}
IMAGE_NAME: ${{ github.repository }}
TAG: ghcr.io/${{ github.repository }}:${{ github.head_ref }}
CONTEXT: .
BRANCH: ${{ github.head_ref }}
DOCKERFILE_PATH: /ckan
Expand All @@ -37,17 +36,6 @@ jobs:
- name: Check out code
uses: actions/checkout@v4

- name: Set DOCKERFILE_PATH
run: |
BRANCH_TRIMMED=$(echo ${{ env.BRANCH }} | sed -n -e 's/^ckan-\([0-9]*\.[0-9]*\).*$/\1/p')
if [[ "${{ env.BRANCH }}" == "master" ]]; then
echo "DOCKERFILE_PATH=/ckan-master/base" >> $GITHUB_ENV
elif [[ "${{ env.BRANCH }}" == *"-dev" ]]; then
echo "DOCKERFILE_PATH=/ckan-${BRANCH_TRIMMED}/dev" >> $GITHUB_ENV
else
echo "DOCKERFILE_PATH=/ckan-${BRANCH_TRIMMED}/base" >> $GITHUB_ENV
fi
- name: Login to registry
uses: docker/login-action@v3
with:
Expand Down
15 changes: 2 additions & 13 deletions .github/workflows/docker-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ on: workflow_dispatch

env:
REGISTRY: ghcr.io
IMAGE_NAME: mjanez/ckan-base-spatial
TAG: ghcr.io/mjanez/ckan-base-spatial:${{ github.ref_name }}
IMAGE_NAME: ${{ github.repository }}
TAG: ghcr.io/${{ github.repository }}:${{ github.ref_name }}
CONTEXT: .
BRANCH: ${{ github.ref_name }}
DOCKERFILE_PATH: /ckan
Expand All @@ -26,17 +26,6 @@ jobs:
- name: Check out code
uses: actions/checkout@v4

- name: Set DOCKERFILE_PATH
run: |
BRANCH_TRIMMED=$(echo ${{ env.BRANCH }} | sed -n -e 's/^ckan-\([0-9]*\.[0-9]*\).*$/\1/p')
if [[ "${{ env.BRANCH }}" == "master" ]]; then
echo "DOCKERFILE_PATH=/ckan-master/base" >> $GITHUB_ENV
elif [[ "${{ env.BRANCH }}" == *"-dev" ]]; then
echo "DOCKERFILE_PATH=/ckan-${BRANCH_TRIMMED}/dev" >> $GITHUB_ENV
else
echo "DOCKERFILE_PATH=/ckan-${BRANCH_TRIMMED}/base" >> $GITHUB_ENV
fi
- name: Login to registry
uses: docker/login-action@v3
with:
Expand Down
54 changes: 41 additions & 13 deletions .github/workflows/docker-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ on:
branches:
- master
- 'ckan-*.*.*'
- '!ckan-main'
- '!dev/ckan-*.*.*'
- '!feature/*'
- '!fix/*'

env:
REGISTRY: ghcr.io
IMAGE_NAME: mjanez/ckan-docker
IMAGE_NAME: ckan-docker
CONTEXT: .
BRANCH: ${{ github.head_ref }}
DOCKERFILE_PATH: /ckan
Expand All @@ -34,16 +33,45 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set DOCKERFILE_PATH
run: |
BRANCH_TRIMMED=$(echo ${{ env.BRANCH }} | sed -n -e 's/^ckan-\([0-9]*\.[0-9]*\).*$/\1/p')
if [[ "${{ env.BRANCH }}" == "master" ]]; then
echo "DOCKERFILE_PATH=/ckan-master/base" >> $GITHUB_ENV
elif [[ "${{ env.BRANCH }}" == *"-dev" ]]; then
echo "DOCKERFILE_PATH=/ckan-${BRANCH_TRIMMED}/dev" >> $GITHUB_ENV
else
echo "DOCKERFILE_PATH=/ckan-${BRANCH_TRIMMED}/base" >> $GITHUB_ENV
fi
- name: NGINX build
uses: docker/build-push-action@v5
with:
context: ./nginx
file: ./nginx/Dockerfile
push: false
tags: mjanez/ckan-docker-nginx:test-build-only

- name: Apache HTTP Server build
uses: docker/build-push-action@v5
with:
context: ./apache
file: ./apache/Dockerfile
push: false
tags: mjanez/ckan-docker-apache:test-build-only

- name: PostgreSQL build
uses: docker/build-push-action@v5
with:
context: ./postgresql
file: ./postgresql/Dockerfile
push: false
tags: mjanez/ckan-docker-postgresql:test-build-only

- name: Solr build
uses: docker/build-push-action@v5
with:
context: ./solr
file: ./solr/Dockerfile
push: false
tags: mjanez/ckan-docker-solr:test-build-only

- name: ckan-pycsw build
uses: docker/build-push-action@v4
with:
context: ./ckan-pycsw
file: ./ckan-pycsw/Dockerfile
push: false
tags: mjanez/ckan-docker-pycsw:test-build-only

- name: Extract Docker metadata
id: meta
Expand All @@ -55,7 +83,7 @@ jobs:
id: hadolint
uses: jbergstroem/[email protected]
with:
dockerfile: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }} ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }}
dockerfile: ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }} ${{ env.CONTEXT }}${{ env.DOCKERFILE_PATH }}/${{ env.DOCKERFILE }}.ghcr
version: ${{ env.HADOLINT_VERSION }}
annotate: true
error_level: -1

0 comments on commit bfdd2f8

Please sign in to comment.