Merge pull request #117 from opensafely-core/docker-labels

add docker build labels
opensafely-core · Dec 6, 2022 · 9c78ae5 · 9c78ae5
2 parents c30a953 + c054c20
commit 9c78ae5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/add-pkg.sh b/add-pkg.sh
@@ -9,6 +9,8 @@ IMAGE=${IMAGE:-ghcr.io/opensafely-core/r}
 # docker tags need to be lowercase
 NAME=$(echo "$PACKAGE" | tr '[:upper:]' '[:lower:]')
 INSTALL_ARGS="Ncpus=8"
+BUILD_DATE="$(date +'%y-%m-%dT%H:%M:%S.%3NZ')"
+REVISION="$(git rev-parse --short HEAD)"
 
 trap 'docker container rm $NAME || true' EXIT
 
@@ -20,7 +22,7 @@ if test "$TYPE" == "r"; then
 else
     docker run --name "$NAME" --entrypoint bash "$IMAGE" -c "apt-get install -y $PACKAGE"
 fi
-docker commit --change "CMD []" --change 'ENTRYPOINT ["/usr/bin/Rscript"]' "$NAME" "r-$NAME"
+docker commit --change "CMD []" --change 'ENTRYPOINT ["/usr/bin/Rscript"]' --change "LABEL org.opencontainers.image.created=$BUILD_DATE org.opencontainers.image.revision=$REVISION" "$NAME" "r-$NAME" 
 
 if test "$TYPE" == "r"; then
     docker run "r-$NAME" -e "library('$PACKAGE')"