From b5baf324b6b55240f8c277ec3978df8c80b102f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Tue, 4 Oct 2022 18:18:16 +0000
Subject: [PATCH] Merge branch 'f-pipeline' into 'dev'
MAINT: remove manual RUST installation in pipeline
See merge request caosdb/src/caosdb-pyinttest!44
---
.docker-base/Dockerfile | 28 +---------------------------
.gitlab-ci.yml | 14 +++++++-------
2 files changed, 8 insertions(+), 34 deletions(-)
diff --git a/.docker-base/Dockerfile b/.docker-base/Dockerfile
index da6e37c..477d194 100644
--- a/.docker-base/Dockerfile
+++ b/.docker-base/Dockerfile
@@ -1,5 +1,5 @@
# Use docker as parent image
-FROM docker:20.10.3
+FROM docker:20.10.18
# http://bugs.python.org/issue19846
ENV LANG C.UTF-8
@@ -11,32 +11,6 @@ RUN apk add --no-cache libffi-dev openssl-dev libc-dev libxslt libxslt-dev \
libxml2 libxml2-dev
RUN apk add --no-cache ca-certificates
-# install rust (needed for compiling a docker-compose dependency)
-# This is necessary until alpine comes with an up to date RUST
-# copied from https://github.com/rust-lang/docker-rust/blob/bbc7feb12033da3909dced4e88ddbb6964fbc328/1.50.0/alpine3.13/Dockerfile
-
-ENV RUSTUP_HOME=/usr/local/rustup \
- CARGO_HOME=/usr/local/cargo \
- PATH=/usr/local/cargo/bin:$PATH \
- RUST_VERSION=1.50.0
-
-RUN set -eux; \
- apkArch="$(apk --print-arch)"; \
- case "$apkArch" in \
- x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='05c5c05ec76671d73645aac3afbccf2187352fce7e46fc85be859f52a42797f6' ;; \
- aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='6a8a480d8d9e7f8c6979d7f8b12bc59da13db67970f7b13161ff409f0a771213' ;; \
- *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
- esac; \
- url="https://static.rust-lang.org/rustup/archive/1.23.1/${rustArch}/rustup-init"; \
- wget "$url"; \
- echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
- chmod +x rustup-init; \
- ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
- rm rustup-init; \
- chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
- rustup --version; \
- cargo --version; \
- rustc --version;
RUN pip3 install wheel
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 092b9e1..9a2950f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -146,11 +146,11 @@ test:
- CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
# Store versions of CaosDB parts
- - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_pylib_commit > hash_pylib
- - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_webui_commit > hash_webui
- - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_server_commit > hash_server
- - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_mysqlbackend_commit > hash_mysql
- - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_proto_commit > hash_proto
+ - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_pylib_commit > hash_pylib
+ - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_webui_commit > hash_webui
+ - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_server_commit > hash_server
+ - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_mysqlbackend_commit > hash_mysql
+ - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_proto_commit > hash_proto
- cat hash_server
- cat hash_proto
- cat hash_mysql
@@ -161,8 +161,8 @@ test:
- /bin/sh ./run.sh
# Save logs
- - docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
- - docker logs docker_sqldb_1 &> ../mariadb_log.txt
+ - docker logs docker-caosdb-server-1 &> ../caosdb_log.txt
+ - docker logs docker-sqldb-1 &> ../mariadb_log.txt
- cd ..
# Stop the server
--
GitLab