Skip to content
Snippets Groups Projects
Commit 709848fdb0c2 authored by Christophe de Vienne's avatar Christophe de Vienne
Browse files

ci: Switch to quay

parent 2b0b991cdad7
No related branches found
No related tags found
No related merge requests found
image: docker.orus.io/cc/golang:1.15-focal image: quay.orus.io/cc/golang:1.15-focal
stages: stages:
- prepare - prepare
...@@ -7,5 +7,5 @@ ...@@ -7,5 +7,5 @@
build_image: build_image:
stage: prepare stage: prepare
image: docker.orus.io/cc/docker image: quay.orus.io/cc/buildkit
variables: variables:
...@@ -11,5 +11,5 @@ ...@@ -11,5 +11,5 @@
variables: variables:
DOCKER_IMAGE: docker.orus.io/orus/rednerd-build-image DOCKER_IMAGE: quay.orus.io/orus/rednerd-build-image
DOCKERFILE: "-" DOCKER_BUILD_OPTS: --export-cache type=inline --import-cache type=registry,ref=$DOCKER_IMAGE
script: script:
- mkdir ~/.docker - mkdir ~/.docker
...@@ -14,5 +14,3 @@ ...@@ -14,5 +14,3 @@
script: script:
- mkdir ~/.docker - mkdir ~/.docker
- echo $DOCKER_AUTH_CONFIG > ~/.docker/config.json
- docker pull $DOCKER_IMAGE || true
- | - |
...@@ -18,6 +16,6 @@ ...@@ -18,6 +16,6 @@
- | - |
CUSTOM_TAG=$CI_PIPELINE_ID docker-build <<EOF cat > Dockerfile <<EOF
FROM docker.orus.io/cc/golang:1.15-focal FROM quay.orus.io/cc/golang:1.15-focal
RUN apt-get update && \ RUN apt-get update && \
apt-get install --yes --no-install-recommends \ apt-get install --yes --no-install-recommends \
python3-pip python3-setuptools libcairo2 libpangocairo-1.0 \ python3-pip python3-setuptools libcairo2 libpangocairo-1.0 \
...@@ -27,6 +25,7 @@ ...@@ -27,6 +25,7 @@
RUN pip3 install -r requirements.txt RUN pip3 install -r requirements.txt
RUN mkdir /libreoffice && curl https://s3.fr-par.scw.cloud/orus-io-public/libreoffice-dist/libreoffice-orusdist-7.1.0.3-cdv-1-ubuntu-20.04.tar.xz |unxz |tar x -C /libreoffice RUN mkdir /libreoffice && curl https://s3.fr-par.scw.cloud/orus-io-public/libreoffice-dist/libreoffice-orusdist-7.1.0.3-cdv-1-ubuntu-20.04.tar.xz |unxz |tar x -C /libreoffice
EOF EOF
- CUSTOM_TAG=pipeline-$CI_PIPELINE_ID build-img
lint_code: lint_code:
stage: test stage: test
...@@ -30,7 +29,7 @@ ...@@ -30,7 +29,7 @@
lint_code: lint_code:
stage: test stage: test
image: docker.orus.io/orus/rednerd-build-image:$CI_PIPELINE_ID image: quay.orus.io/orus/rednerd-build-image:pipeline-$CI_PIPELINE_ID
cache: cache:
paths: paths:
- tools/bin - tools/bin
...@@ -42,7 +41,7 @@ ...@@ -42,7 +41,7 @@
unit_tests: unit_tests:
stage: test stage: test
image: docker.orus.io/orus/rednerd-build-image:$CI_PIPELINE_ID image: quay.orus.io/orus/rednerd-build-image:pipeline-$CI_PIPELINE_ID
services: services:
- name: postgres:11-alpine - name: postgres:11-alpine
command: ["-c", "fsync=off"] command: ["-c", "fsync=off"]
...@@ -71,6 +70,6 @@ ...@@ -71,6 +70,6 @@
build-docker: build-docker:
stage: build stage: build
image: docker.orus.io/cc/docker image: quay.orus.io/cc/buildkit
variables: variables:
DOCKER_PATH: . DOCKER_PATH: .
...@@ -75,5 +74,5 @@ ...@@ -75,5 +74,5 @@
variables: variables:
DOCKER_PATH: . DOCKER_PATH: .
DOCKER_IMAGE: docker.orus.io/orus/rednerd DOCKER_IMAGE: quay.orus.io/orus/rednerd
DOCKERFILE: docker/Dockerfile DOCKERFILE: docker/Dockerfile
script: script:
...@@ -78,6 +77,6 @@ ...@@ -78,6 +77,6 @@
DOCKERFILE: docker/Dockerfile DOCKERFILE: docker/Dockerfile
script: script:
- docker-build - build-img
build-docker-standalone: build-docker-standalone:
stage: build stage: build
...@@ -81,6 +80,6 @@ ...@@ -81,6 +80,6 @@
build-docker-standalone: build-docker-standalone:
stage: build stage: build
image: docker.orus.io/cc/docker image: quay.orus.io/cc/buildkit
variables: variables:
DOCKER_PATH: . DOCKER_PATH: .
...@@ -85,5 +84,5 @@ ...@@ -85,5 +84,5 @@
variables: variables:
DOCKER_PATH: . DOCKER_PATH: .
DOCKER_IMAGE: docker.orus.io/orus/rednerd-standalone DOCKER_IMAGE: quay.orus.io/orus/rednerd-standalone
DOCKERFILE: docker-standalone/Dockerfile DOCKERFILE: docker-standalone/Dockerfile
script: script:
...@@ -88,3 +87,3 @@ ...@@ -88,3 +87,3 @@
DOCKERFILE: docker-standalone/Dockerfile DOCKERFILE: docker-standalone/Dockerfile
script: script:
- docker-build - build-img
FROM docker.orus.io/cloudcrane/confd:0.16.0-alpine as confd FROM quay.orus.io/cc/confd:0.16.0-alpine as confd
FROM ubuntu:20.04 FROM ubuntu:20.04
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment