Skip to content

Commit b49219f

Browse files
committed
misc: Make base optional
1 parent 8390d9c commit b49219f

2 files changed

Lines changed: 4 additions & 14 deletions

File tree

.github/actions/docker-build/action.yaml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ inputs:
1313
required: true
1414
base:
1515
description: "Base docker image to build on top of"
16-
required: true
17-
default: "devitocodes/bases:cpu-gcc"
16+
default: ""
1817

1918
outputs:
2019
unique:
@@ -35,20 +34,12 @@ runs:
3534
- id: dockerbuild
3635
name: "Build docker container"
3736
shell: bash
37+
env:
38+
BASE: ${{ inputs.base }}
3839
run: |
3940
docker build \
4041
--pull \
4142
--file ${{ inputs.file }} \
4243
--tag ${{ inputs.tag }}_${{ steps.uniquetag.outputs.unique }} \
43-
--build-arg base=${{ inputs.base }} \
44+
${BASE:+--build-arg base=$BASE} \
4445
.
45-
46-
# Do we need to be more specific?
47-
#~ docker buildx build . \
48-
#~ --builder "${RUNNER_NAME// /_}" \
49-
#~ --load \
50-
#~ --label ci-run="$GITHUB_RUN_ID" \
51-
#~ --rm --pull \
52-
#~ --file docker/Dockerfile.devito \
53-
#~ --tag "${DOCKER_IMAGE}" \
54-
#~ --build-arg base="${{ matrix.base }}"

docker/Dockerfile.devito

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
##############################################################
44

55
# Base image with compilers
6-
# Update default in .github/actions/docker-build if this value ever changes
76
ARG base=devitocodes/bases:cpu-gcc
87

98
FROM $base AS builder

0 commit comments

Comments
 (0)