signald/infrastructure
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

install git on the final container so it can be used for CI

Browse source
This commit is contained in:
finn 2021-02-19 15:42:37 -08:00
parent 2026958466
commit 5d198e21ff
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.yml
View file

@ -37,6 +37,7 @@ freebsd-cross-build:
- apk add git - apk add git
- git clone https://github.com/wezm/freebsd-cross-build.git - git clone https://github.com/wezm/freebsd-cross-build.git
- cd freebsd-cross-build - cd freebsd-cross-build
- echo "RUN apt-get update && apt-get install -y git" >> Dockerfile
- VERSION=$(git rev-parse --short=8 HEAD) - VERSION=$(git rev-parse --short=8 HEAD)
- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY} - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
- docker build -t ${CI_REGISTRY_IMAGE}/${CI_JOB_NAME}:${VERSION} . - docker build -t ${CI_REGISTRY_IMAGE}/${CI_JOB_NAME}:${VERSION} .

10
signald-builder.Dockerfile
View file

@ -1,4 +1,6 @@
FROM debian:latest FROM debian:latest
RUN dpkg --add-architecture armhf && dpkg --add-architecture arm64
ADD apt-signing-key.asc /tmp/apt-signing-key.asc
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
gpg \ gpg \
dpkg-dev \ dpkg-dev \
@ -13,11 +15,15 @@ RUN apt-get update && apt-get install -y \
gradle-debian-helper \ gradle-debian-helper \
jq \ jq \
aptly \ aptly \
build-essential \
crossbuild-essential-armhf \
crossbuild-essential-arm64 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN adduser signald
COPY deb-scripts/release-deb.sh /usr/bin/release-deb COPY deb-scripts/release-deb.sh /usr/bin/release-deb
COPY deb-scripts/get-component.sh /usr/bin/get-component COPY deb-scripts/get-component.sh /usr/bin/get-component
COPY deb-scripts/repo-cron.sh /usr/bin/repo-cron COPY deb-scripts/repo-cron.sh /usr/bin/repo-cron
RUN adduser signald
USER signald USER signald
ADD apt-signing-key.asc /tmp/apt-signing-key.asc
RUN gpg --no-default-keyring --keyring trustedkeys.gpg --import /tmp/apt-signing-key.asc RUN gpg --no-default-keyring --keyring trustedkeys.gpg --import /tmp/apt-signing-key.asc