update docker and ci files

This commit is contained in:
Tim Schubert 2022-05-22 22:15:10 +02:00
parent a9d1d2ab20
commit 3cb385044d
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
5 changed files with 5 additions and 15 deletions

15
.gitignore vendored
View file

@ -1,16 +1,5 @@
*.swp
.direnv
<<<<<<< HEAD
<<<<<<< HEAD
||||||| parent of 2ccfcd1 (fixup flake)
testgit
*.swp
=======
testgit
*.swp
pad-archiver
result
>>>>>>> 2ccfcd1 (fixup flake)
||||||| parent of 056d53e (port to go)
=======
testgit
*.swp
>>>>>>> 056d53e (port to go)

View file

@ -12,5 +12,6 @@ build_image:
rules:
- if: '$CI_DEFAULT_BRANCH == $CI_COMMIT_BRANCH'
script:
- go build
- docker build -t $IMAGE_NAME:$CI_COMMIT_BRANCH .
- docker push $IMAGE_NAME:$CI_COMMIT_BRANCH

View file

@ -2,7 +2,7 @@ FROM alpine/git
RUN apk add --no-cache curl
ADD ./update /usr/bin/update
ADD ./pad-archiver /usr/bin/pad-archiver
# Override ENTRYPOINT of alpine/git
ENTRYPOINT /bin/sh

View file

@ -12,5 +12,5 @@ update:
- git config --global user.email "git@git.fginfo.tu-bs.de"
- git config --global user.name "Gitlab CI"
script:
- update < pads.txt
- pad-archiver < pads.txt
- git push "https://gitlab-ci-token:${CI_ACCESS_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o skip-ci

Binary file not shown.