From b38be7e3a9804494686fe20e83e57da06289128d Mon Sep 17 00:00:00 2001
From: Florent Jaillet <florent.jaillet@lis-lab.fr>
Date: Tue, 6 Feb 2018 14:37:07 +0100
Subject: [PATCH] Updating GitLab CI configuration and Dockerfile for i686
---
.gitlab-ci.yml | 6 +++---
docker/Dockerfile_i686 | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dba454..79ecf59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
# Tests on X86_64 ubuntu
unbutu:X86_64:
- image: registry.gitlab.lif.univ-mrs.fr:5005/dev/ltfatpy/ubuntu:X86_64
+ image: registry.gitlab.lis-lab.fr:5005/dev/ltfatpy/ubuntu:X86_64
tags:
- docker
script:
@@ -17,7 +17,7 @@ unbutu:X86_64:
# Tests on i686 ubuntu
ubuntu:i686:
- image: registry.gitlab.lif.univ-mrs.fr:5005/dev/ltfatpy/ubuntu:i686
+ image: registry.gitlab.lis-lab.fr:5005/dev/ltfatpy/ubuntu:i686
tags:
- docker
script:
@@ -43,7 +43,7 @@ ubuntu:i686:
# Doc Generation
pages:
<<: *doc
- image: registry.gitlab.lif.univ-mrs.fr:5005/dev/ltfatpy/ubuntu:X86_64
+ image: registry.gitlab.lis-lab.fr:5005/dev/ltfatpy/ubuntu:X86_64
tags:
- docker
only:
diff --git a/docker/Dockerfile_i686 b/docker/Dockerfile_i686
index f530325..64169d0 100644
--- a/docker/Dockerfile_i686
+++ b/docker/Dockerfile_i686
@@ -1,4 +1,4 @@
-FROM ioft/i386-ubuntu
+FROM i386/ubuntu:latest
MAINTAINER Denis Arrivault
WORKDIR /
RUN apt-get update && apt-get install -y \
@@ -19,4 +19,4 @@ RUN pip3 install nose coverage pytest pytest-cov
# ADD ../dist/ltfatpy-1.0.8.tar.gz /
# cleanup
-RUN apt-get -qy autoremove
\ No newline at end of file
+RUN apt-get -qy autoremove
--
GitLab