diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2023-03-13 12:51:19 +0100 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2023-03-13 12:51:19 +0100 |
commit | b9629b523ceec5fc51cbc6b0ba48302ff070eea1 (patch) | |
tree | d5ff60891b341af83ee8424145b157267f75086b | |
parent | 9aa0ff88061fb3bcec4927aaff09a43657f4f07d (diff) |
ci: Drop job pushing sq to Gitlab's Docker Registry.
- This has to move to sq's new repository.
-rw-r--r-- | .gitlab-ci.yml | 33 | ||||
-rw-r--r-- | Dockerfile | 60 |
2 files changed, 0 insertions, 93 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d192704..cef35204 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -381,39 +381,6 @@ windows-msvc32-cng: variables: CFLAGS: "" # Silence some C warnings when compiling with MSVC -docker-build-push: - # Official docker image. - image: docker:stable - stage: build - services: - - docker:dind - tags: - - docker - - self-hosted - before_script: - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - script: - - > - docker build - --no-cache - --target sq - --tag "$IMAGE":latest - . - # smoke test - - docker run "$IMAGE":latest --help - - docker push "$IMAGE":latest - after_script: [] - only: - refs: - - /docker/i # refs containing 'docker' keyword - - tags - - web - - schedules - variables: - CI_REGISTRY: "registry.gitlab.com" - IMAGE: "$CI_REGISTRY/sequoia-pgp/sequoia" - DOCKER_HOST: tcp://docker:2376 - variables: DEBIAN_FRONTEND: noninteractive CARGO_HOME: $CI_PROJECT_DIR/../cargo diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 63e97bef..00000000 --- a/Dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -# See https://gitlab.com/sequoia-pgp/sequoia/-/blob/main/README.md#debian -# for system requirements -FROM debian:bookworm AS build - -# create a sandbox user for the build (in ~builder) and install (in /opt) -# give it permissions to the build dir and home -# upgrade everything -# add dependencies, as specified by the Sequoia README.md file -RUN groupadd builder && \ - useradd --no-log-init --create-home --gid builder builder && \ - apt-get update && \ - apt-get upgrade --assume-yes && \ - apt-get install --assume-yes --no-install-recommends \ - ca-certificates \ - capnproto \ - cargo \ - git \ - libclang-dev \ - libsqlite3-dev \ - libssl-dev \ - make \ - nettle-dev \ - pkg-config \ - rustc \ - && \ - apt-get clean && \ - chown builder /opt - -COPY --chown=builder:builder . /home/builder/sequoia - -# switch to the sandbox user -USER builder - -# retry build because cargo sometimes segfaults during download (#918854) -# -# the `build-release` target is used instead of the default because -# `install` calls it after anyways -RUN cd /home/builder/sequoia && \ - CARGO_TARGET_DIR=target cargo build -p sequoia-sq --release && \ - install --strip -D --target-directory /opt/usr/local/bin \ - target/release/sq - -FROM debian:bookworm-slim AS sq-base - -RUN groupadd user && \ - useradd --no-log-init -g user user && \ - mkdir /home/user && \ - chown -R user:user /home/user && \ - apt-get update && \ - apt-get upgrade --assume-yes && \ - apt-get install --assume-yes ca-certificates libssl3 libsqlite3-0 && \ - apt-get clean && \ - rm -fr -- /var/lib/apt/lists/* /var/cache/* - -FROM sq-base AS sq - -COPY --from=build /opt/usr/local/bin/sq /usr/local/bin/sq -COPY --from=build /etc/ssl/certs /etc/ssl/certs - -ENTRYPOINT ["/usr/local/bin/sq"] |