From ad061419e6032d49a5ba67ba9853220bab599e03 Mon Sep 17 00:00:00 2001
From: Vasili Novikov <n1dr+cm3513git@ya.ru>
Date: Thu, 9 Jul 2020 21:24:30 +0200
Subject: [PATCH] WIP: docker
---
.gitlab-ci.yml | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b35ab10a..62311e0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
-#### The image base should be the same as in Dockerfile
-#### UPDATE: not used for now
-# image: 'rust:slim'
+#### The image base is better to be the same as in Dockerfile
+image: 'rust:slim'
stages:
- test
@@ -11,17 +10,16 @@ variables:
APT_CACHE_DIR: $CI_PROJECT_DIR/apt
before_script:
- # WARNING: dirty work-around:
- # `libsqlcipher-dev` is right now installed on gitlab-runner (shell) host
- - dpkg -l libsqlcipher-dev
- # - apt-get update -yq
- # - apt-get install -o dir::cache::archives="$APT_CACHE_DIR" -y libsqlcipher-dev
+ - apt-get update -yq
+ - apt-get install -o dir::cache::archives="$APT_CACHE_DIR" -y libsqlcipher-dev
- rustup component add rustfmt
- rustup component add clippy
test:
stage: test
+ tags:
+ - docker
script:
- rustc --version
- cargo --version
--
GitLab