Merge branch 'feature/docker_reorg' into dev (21536ec3) · Commits · streichg / Finn · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

Finn
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Admin message

To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

21536ec3

Commit 21536ec3 authored 4 years ago by Yaman Umuroglu

Downloads
- Plain Diff

Merge branch 'feature/docker_reorg' into dev

parents af828f3f d7323d21

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 0 deletions

.gitignore
docker/Dockerfile.finn_ci 93 additions, 0 deletions

docker/Dockerfile.finn_ci
docker/Dockerfile.finn_dev 37 additions, 31 deletions

docker/Dockerfile.finn_dev
docker/Dockerfile.jenkins 11 additions, 0 deletions

docker/Dockerfile.jenkins
docker/Jenkinsfile 52 additions, 0 deletions

docker/Jenkinsfile
docker/finn_entrypoint.sh 10 additions, 0 deletions

docker/finn_entrypoint.sh
docker/launch-jenkins.sh 19 additions, 0 deletions

docker/launch-jenkins.sh
run-docker.sh 8 additions, 6 deletions

run-docker.sh

with 233 additions and 37 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment