Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
CaosDB Python Integration Tests
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
CaosDB Python Integration Tests
Commits
e589e92d
Commit
e589e92d
authored
2 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Patches
Plain Diff
MAITN: remove manual install of rust
parent
16ac853e
No related branches found
No related tags found
1 merge request
!44
MAINT: remove manual RUST installation in pipeline
Pipeline
#28939
passed
2 years ago
Stage: info
Stage: setup
Stage: cert
Stage: style
Stage: test
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.docker-base/Dockerfile
+1
-27
1 addition, 27 deletions
.docker-base/Dockerfile
.gitlab-ci.yml
+7
-7
7 additions, 7 deletions
.gitlab-ci.yml
with
8 additions
and
34 deletions
.docker-base/Dockerfile
+
1
−
27
View file @
e589e92d
# Use docker as parent image
# Use docker as parent image
FROM
docker:20.10.
3
FROM
docker:20.10.
18
# http://bugs.python.org/issue19846
# http://bugs.python.org/issue19846
ENV
LANG C.UTF-8
ENV
LANG C.UTF-8
...
@@ -11,32 +11,6 @@ RUN apk add --no-cache libffi-dev openssl-dev libc-dev libxslt libxslt-dev \
...
@@ -11,32 +11,6 @@ RUN apk add --no-cache libffi-dev openssl-dev libc-dev libxslt libxslt-dev \
libxml2 libxml2-dev
libxml2 libxml2-dev
RUN
apk add
--no-cache
ca-certificates
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
RUN
pip3
install
wheel
...
...
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
7
−
7
View file @
e589e92d
...
@@ -146,11 +146,11 @@ test:
...
@@ -146,11 +146,11 @@ test:
-
CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
-
CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
# Store versions of CaosDB parts
# 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_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_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_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_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_proto_commit > hash_proto
-
cat hash_server
-
cat hash_server
-
cat hash_proto
-
cat hash_proto
-
cat hash_mysql
-
cat hash_mysql
...
@@ -161,8 +161,8 @@ test:
...
@@ -161,8 +161,8 @@ test:
-
/bin/sh ./run.sh
-
/bin/sh ./run.sh
# Save logs
# Save logs
-
docker logs docker
_
caosdb-server
_
1 &> ../caosdb_log.txt
-
docker logs docker
-
caosdb-server
-
1 &> ../caosdb_log.txt
-
docker logs docker
_
sqldb
_
1 &> ../mariadb_log.txt
-
docker logs docker
-
sqldb
-
1 &> ../mariadb_log.txt
-
cd ..
-
cd ..
# Stop the server
# Stop the server
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment