Compare commits
3 commits
main
...
use-quay.i
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f9a2d91d35 | ||
|
|
552acd3c0d | ||
|
|
aaea032699 |
4 changed files with 19 additions and 7 deletions
|
|
@ -7,7 +7,7 @@ variables:
|
||||||
ANNOUNCE: http://labsync.lab.fablab-nea.de:6969/announce
|
ANNOUNCE: http://labsync.lab.fablab-nea.de:6969/announce
|
||||||
WEBSEED: http://labsync.lab.fablab-nea.de/labsync/$CI_COMMIT_REF_NAME/$CI_PIPELINE_ID/images
|
WEBSEED: http://labsync.lab.fablab-nea.de/labsync/$CI_COMMIT_REF_NAME/$CI_PIPELINE_ID/images
|
||||||
DOCKER_IMAGE_BUILDER: ${CI_REGISTRY_IMAGE}/labsync-builder:main
|
DOCKER_IMAGE_BUILDER: ${CI_REGISTRY_IMAGE}/labsync-builder:main
|
||||||
DOCKER_IMAGE_SECURITY_SCANNER: ${CI_REGISTRY_IMAGE}/security-scanner:$CI_COMMIT_REF_SLUG
|
DOCKER_IMAGE_SECURITY_SCANNER: ${CI_REGISTRY_IMAGE}/security-scanner:main
|
||||||
DOCKER_TLS_CERTDIR: ""
|
DOCKER_TLS_CERTDIR: ""
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
|
|
@ -53,9 +53,19 @@ dockerimage_security_scanner:
|
||||||
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
|
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
|
||||||
- make secscanimg
|
- make secscanimg
|
||||||
- docker push $DOCKER_IMAGE_SECURITY_SCANNER
|
- docker push $DOCKER_IMAGE_SECURITY_SCANNER
|
||||||
except:
|
- echo "DOCKER_IMAGE_SECURITY_SCANNER=${CI_REGISTRY_IMAGE}/security-scanner:$CI_COMMIT_REF_SLUG" >> build.env
|
||||||
refs:
|
artifacts:
|
||||||
- schedules
|
reports:
|
||||||
|
dotenv: build.env
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||||
|
when: on_success
|
||||||
|
- if:
|
||||||
|
changes:
|
||||||
|
paths:
|
||||||
|
- security-scanner/**/*
|
||||||
|
compare_to: main
|
||||||
|
when: on_success
|
||||||
|
|
||||||
security_scanner:
|
security_scanner:
|
||||||
stage: check
|
stage: check
|
||||||
|
|
@ -74,7 +84,7 @@ security_scanner:
|
||||||
|
|
||||||
lightburn-download:
|
lightburn-download:
|
||||||
stage: prepare
|
stage: prepare
|
||||||
image: alpine
|
image: quay.io/official-images/alpine
|
||||||
script:
|
script:
|
||||||
- mkdir -p packer/ansible/roles/lightburn/files
|
- mkdir -p packer/ansible/roles/lightburn/files
|
||||||
- 'wget -O packer/ansible/roles/lightburn/files/lightburn.zip --header "JOB-TOKEN: $CI_JOB_TOKEN" "${CI_SERVER_URL}/api/v4/projects/fablab%2Flightburn-patched/jobs/artifacts/main/download?job=patch-Linux64"'
|
- 'wget -O packer/ansible/roles/lightburn/files/lightburn.zip --header "JOB-TOKEN: $CI_JOB_TOKEN" "${CI_SERVER_URL}/api/v4/projects/fablab%2Flightburn-patched/jobs/artifacts/main/download?job=patch-Linux64"'
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
FROM docker
|
FROM docker
|
||||||
|
|
||||||
|
# funaietu
|
||||||
|
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
ansible \
|
ansible \
|
||||||
aws-cli \
|
aws-cli \
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ variables:
|
||||||
|
|
||||||
builders:
|
builders:
|
||||||
- discard: true
|
- discard: true
|
||||||
image: debian:bookworm
|
image: quay.io/official-images/debian:bookworm
|
||||||
type: docker
|
type: docker
|
||||||
volumes:
|
volumes:
|
||||||
'{{user `images`}}': /tmp/images
|
'{{user `images`}}': /tmp/images
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
FROM debian:bookworm-slim
|
FROM quay.io/official-images/debian:bookworm-slim
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get -y install \
|
&& apt-get -y install \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue