Skip to content

Commit 83abc77

Browse files
committed
tag from dockerfile
1 parent 68c2dea commit 83abc77

3 files changed

Lines changed: 13 additions & 6 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
ARG IMAGE_NAME=node_24_python_3_14
2-
ARG IMAGE_VERSION=latest
3-
FROM ghcr.io/nhsdigital/eps-devcontainers/${IMAGE_NAME}:${IMAGE_VERSION}
1+
FROM ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_14:v1.2.0
42

53
USER root
64
# specify DOCKER_GID to force container docker group id to match host

.devcontainer/devcontainer.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
"context": "..",
66
"args": {
77
"DOCKER_GID": "${env:DOCKER_GID:}",
8-
"IMAGE_NAME": "node_24_python_3_14",
9-
"IMAGE_VERSION": "v1.2.0",
108
"USER_UID": "${localEnv:USER_ID:}",
119
"USER_GID": "${localEnv:GROUP_ID:}"
1210
},

.github/workflows/get-repo-config.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ jobs:
5151
- name: Checkout code
5252
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
5353
with:
54-
ref: ${{ env.BRANCH_NAME }}
5554
fetch-depth: 0
5655

5756
- name: Load config value
@@ -60,6 +59,18 @@ jobs:
6059
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
6160
DEVCONTAINER_IMAGE=$(jq -r '.build.args.IMAGE_NAME' .devcontainer/devcontainer.json)
6261
DEVCONTAINER_VERSION=$(jq -r '.build.args.IMAGE_VERSION' .devcontainer/devcontainer.json)
62+
if [ "$DEVCONTAINER_IMAGE" == "null" ]; then
63+
dockerfile=".devcontainer/Dockerfile"
64+
65+
from_ref="$(
66+
awk '/^FROM[[:space:]]+/ { print $2; exit }' "$dockerfile"
67+
)"
68+
69+
DEVCONTAINER_IMAGE="${from_ref##*/}"
70+
DEVCONTAINER_IMAGE="${DEVCONTAINER_IMAGE%%:*}"
71+
72+
DEVCONTAINER_VERSION="${from_ref##*:}"
73+
fi
6374
RUNTIME_DOCKER_IMAGE="${DEVCONTAINER_IMAGE}:githubactions-${DEVCONTAINER_VERSION}"
6475
{
6576
echo "TAG_FORMAT=$TAG_FORMAT"

0 commit comments

Comments
 (0)