From 6fb0c319e7c648915b2821794e6f001020da208b Mon Sep 17 00:00:00 2001
From: Amandine PERRIN <amandine.perrin@pasteur.fr>
Date: Tue, 18 Apr 2017 17:30:34 +0200
Subject: [PATCH] Update gitlab ci and dockerfile
---
.gitlab-ci.yml | 4 ++--
Dockerfile | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de38164a..ed2e797d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ services:
- docker:dind
variables:
- CI_REGISTRY_IMAGE: "registry-gitlab.pasteur.fr/demo/online-course"
+ CI_REGISTRY_IMAGE: "registry-gitlab.pasteur.fr/aperrin/pipeline_annotation"
before_script:
- docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" registry-gitlab.pasteur.fr
@@ -15,6 +15,6 @@ build:
stage: build
script:
- apk update ; apk add git
- - git checkout master -- requirements.txt
+ - git checkout master
- docker build --pull -t "$CI_REGISTRY_IMAGE:testing-ubuntu" .
- docker push "$CI_REGISTRY_IMAGE:testing-ubuntu"
diff --git a/Dockerfile b/Dockerfile
index d1eaef46..eeb98e8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
-from ubuntu
-RUN apt-get update
+from ubuntu:16.04
+RUN apt-get update &&\
+ apt-get -y upgrade
# RUN yum install -y epel-release
# RUN yum install install -y python34-pip python34-devel postgresql-server gcc postgresql-devel
# ADD requirements.txt /requirements.txt
--
GitLab