also push sha for funsies
parent
1f0613d94a
commit
50d59e9ecc
|
|
@ -13,4 +13,4 @@ jobs:
|
|||
DOCKER_PASS: ${{ secrets.DOCKER_PASSWORD }}
|
||||
run: |
|
||||
docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
|
||||
VERSION="${GITHUB_REF#"refs/heads/"}" COMMIT_SHA="$GITHUB_SHA" make publish
|
||||
VERSION=${GITHUB_REF#"refs/heads/"} COMMIT_SHA=${GITHUB_SHA} INITIATOR=${GITHUB_ACTOR} make publish
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ ARG version=dev
|
|||
ARG commit=dev
|
||||
ARG created=never
|
||||
|
||||
LABEL maintainer="Adam Veldhousen <adam@veldhousen.net>"
|
||||
LABEL net.veldhousen.version=${version}
|
||||
LABEL net.veldhousen.commit=${commit}
|
||||
LABEL net.veldhousen.created=${created}
|
||||
|
|
|
|||
4
makefile
4
makefile
|
|
@ -11,9 +11,10 @@ build: ./tools
|
|||
--build-arg created=$${CREATED_TS:-$$(date +%s)} \
|
||||
-f ./Dockerfile .
|
||||
|
||||
|
||||
publish: build
|
||||
docker push vdhsn/dotfiles:$${VERSION}
|
||||
docker tag vdhsn/dotfiles:$${VERSION} vdhsn/dotfiles:$$(echo $${COMMIT_SHA} | sed -E 's/^(.{10}).*$$/\1/')
|
||||
docker push vdhsn/dotfiles:$$(echo $${COMMIT_SHA} | sed -E 's/^(.{10}).*$$/\1/')
|
||||
|
||||
build-test: ./tools
|
||||
docker build -t vdhsn/dotfiles:deb-test -f ./Dockerfile.debian .
|
||||
|
|
@ -25,7 +26,6 @@ deb-test:
|
|||
--workdir /home/dotfiles/Projects/dotfiles \
|
||||
vdhsn/dotfiles:deb-test
|
||||
|
||||
|
||||
dev:
|
||||
docker run -it --rm --name dotfiles \
|
||||
-u $${USER_ID:-1000} \
|
||||
|
|
|
|||
Loading…
Reference in New Issue