Skip to content
Snippets Groups Projects
Commit 09c0ee03f245 authored by Pierre Augier's avatar Pierre Augier
Browse files

New image 20200918

parent c865d63fc643
No related branches found
No related tags found
No related merge requests found
......@@ -52,20 +52,21 @@ recent versions.
see `apt_requirements.txt`, `requirements.txt` and `requirements_extra.txt`
for the list of packages being pre-installed into the Docker images.
## Run the tests as for Bitbucket Pipelines
## Run the tests as for Heptapod CI
```
make run image=python3-stable
```
Then, clone the repository and run the commands in bitbucket-pipelines.yml, for
example:
Then, clone the repository and run the commands in .gitlab-ci.yml, for example:
```
hg clone https://bitbucket.org/fluiddyn/fluidimage
hg clone https://foss.heptapod.net/fluiddyn/fluidimage
cd fluidimage
pip install -U tox --user
tox -e py36,codecov -vv
hg up my-great-topic
pip install pip tox --user -U
tox -e py36 -vv
tox -e codecov -vv
```
Other useful commands:
......@@ -78,7 +79,7 @@ docker rm python3-stable
## Update the images on https://hub.docker.com/u/fluiddyn
```make hgpush```
It creates a hg bookmark and pushes it to the main repository. The image should
automatically be built and pushed on the Docker hub.
```
docker login
make push
```
......@@ -4,9 +4,9 @@ Utilises the [travis-python](https://hub.docker.com/u/travisci/ci-python) image
## Building
To build from [Dockerfile](https://bitbucket.org/fluiddyn/fluiddevops) do the following:
To build from [Dockerfile](https://foss.heptapod.net/fluiddyn/fluiddevops) do the following:
```
hg clone https://bitbucket.org/fluiddyn/fluiddevops
hg clone https://foss.heptapod.net/fluiddyn/fluiddevops
cd fluiddevops/docker
make build image=travis-python-debug
```
......
......@@ -13,3 +13,4 @@ libxkbcommon-x11-0
swig
meld
sudo
less
......@@ -23,3 +23,6 @@ topic =
[extdiff]
cmd.meld =
[trusted]
users = root
......@@ -9,7 +9,8 @@ RUN apt-get install -y --no-install-recommends ${pkg}\
RUN rm -rf /var/lib/apt/lists/*
RUN groupadd -g 999 appuser && useradd -m -r -u 999 -g appuser -s /bin/bash appuser -s /bin/bash && usermod -a -G sudo appuser0
RUN groupadd -g 999 appuser && useradd -m -r -u 999 -g appuser -s /bin/bash appuser -s /bin/bash && usermod -a -G sudo appuser
RUN echo appuser:appuser | chpasswd
USER appuser
ARG HOME=/home/appuser
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment