Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Use base/single/Dockerfile for tags 4.05.0 and 4.07.0-flambda #9

Closed
wants to merge 3 commits into from
Closed

feat: Use base/single/Dockerfile for tags 4.05.0 and 4.07.0-flambda #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26873f7
feat: Use base/single/Dockerfile for tags 4.05.0 and 4.07.0-flambda
erikmd Jul 3, 2020
b843b03
Squashed 'external/docker-keeper/' changes from 765dd3e..194dec3
erikmd Jul 3, 2020
f5a1bac
Merge commit 'b843b03cd71eff3a98e75e30af50114480ceb334' into single-s…
erikmd Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/docker-keeper/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.7
0.8.8
2 changes: 1 addition & 1 deletion external/docker-keeper/gitlab-ci-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ check-updates:
cat <<EOF
You need to update docker-keeper : $version -> $upstream, by doing:
cd \$(git rev-parse --show-toplevel)
subtree pull --squash -P $KEEPER_SUBTREE $upstream_repo master
git subtree pull --squash -P $KEEPER_SUBTREE $upstream_repo master
EOF
false
else
Expand Down
22 changes: 13 additions & 9 deletions images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,23 @@ images:
tags:
- tag: '{matrix[tag]}'
- matrix:
# TODO: replace latest with two single switches
tag: ['latest']
tag: ['4.07.1-flambda']
build:
context: './base'
dockerfile: './dual/Dockerfile'
dockerfile: './single/Dockerfile'
args:
COMPILER: '4.07.1+flambda'
NUM_VERSION: '1.3'
tags:
- tag: '{matrix[tag]}'
- matrix:
tag: ['4.05.0']
build:
context: './base'
dockerfile: './single/Dockerfile'
args:
COMPILER: '4.05.0'
COMPILER_EDGE: '4.07.1+flambda'
# TODO: then specify NUM_VERSION
NUM_VERSION: '0'
tags:
- tag: '{matrix[tag]}'
- matrix:
Expand All @@ -45,9 +53,5 @@ images:
build:
context: './base'
dockerfile: './bare/Dockerfile'
args:
# TODO: refactor later on
COMPILER: '4.05.0'
COMPILER_EDGE: '4.07.1+flambda'
tags:
- tag: '{matrix[tag]}'