Skip to content

Commit cab281a

Browse files
AnthirianAnthirian
committed
ci: reduce complexity by avoiding scripting
1 parent 1c31de0 commit cab281a

10 files changed

+10
-58
lines changed

‎.github/workflows/docker-build-dev-base.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,11 @@ jobs:
1818
- name: Prepare
1919
id: prepare
2020
run: |
21-
if [[ "x$DOCKER_REPO" == "x" ]]; then
22-
DOCKER_REPO=outflanknl
23-
fi
24-
DOCKER_IMAGE="${DOCKER_REPO}/redelk-base"
2521
echo ::set-output name=docker_image::${DOCKER_IMAGE}
26-
echo ::set-output name=docker_repo::${DOCKER_REPO}
2722
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2823
VCS_REF=${GITHUB_SHA::8}
2924
env:
30-
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
25+
DOCKER_IMAGE: ${{ vars.DOCKER_REPO || 'outflanknl' }}/redelk-base
3126

3227
- name: Docker meta
3328
id: docker_meta

‎.github/workflows/docker-build-dev-elasticsearch.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,11 @@ jobs:
1818
- name: Prepare
1919
id: prepare
2020
run: |
21-
if [[ "x$DOCKER_REPO" == "x" ]]; then
22-
DOCKER_REPO=outflanknl
23-
fi
24-
DOCKER_IMAGE="${DOCKER_REPO}/redelk-elasticsearch"
2521
echo ::set-output name=docker_image::${DOCKER_IMAGE}
26-
echo ::set-output name=docker_repo::${DOCKER_REPO}
2722
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2823
VCS_REF=${GITHUB_SHA::8}
2924
env:
30-
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
25+
DOCKER_IMAGE: ${{ vars.DOCKER_REPO || 'outflanknl' }}/redelk-elasticsearch
3126

3227
- name: Docker meta
3328
id: docker_meta

‎.github/workflows/docker-build-dev-jupyter.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,11 @@ jobs:
1818
- name: Prepare
1919
id: prepare
2020
run: |
21-
if [[ "x$DOCKER_REPO" == "x" ]]; then
22-
DOCKER_REPO=outflanknl
23-
fi
24-
DOCKER_IMAGE="${DOCKER_REPO}/redelk-jupyter"
2521
echo ::set-output name=docker_image::${DOCKER_IMAGE}
26-
echo ::set-output name=docker_repo::${DOCKER_REPO}
2722
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2823
VCS_REF=${GITHUB_SHA::8}
2924
env:
30-
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
25+
DOCKER_IMAGE: ${{ vars.DOCKER_REPO || 'outflanknl' }}/redelk-jupyter
3126

3227
- name: Docker meta
3328
id: docker_meta

‎.github/workflows/docker-build-dev-kibana.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,11 @@ jobs:
1818
- name: Prepare
1919
id: prepare
2020
run: |
21-
if [[ "x$DOCKER_REPO" == "x" ]]; then
22-
DOCKER_REPO=outflanknl
23-
fi
24-
DOCKER_IMAGE="${DOCKER_REPO}/redelk-kibana"
2521
echo ::set-output name=docker_image::${DOCKER_IMAGE}
26-
echo ::set-output name=docker_repo::${DOCKER_REPO}
2722
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2823
VCS_REF=${GITHUB_SHA::8}
2924
env:
30-
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
25+
DOCKER_IMAGE: ${{ vars.DOCKER_REPO || 'outflanknl' }}/redelk-kibana
3126

3227
- name: Docker meta
3328
id: docker_meta

‎.github/workflows/docker-build-dev-logstash.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,11 @@ jobs:
1818
- name: Prepare
1919
id: prepare
2020
run: |
21-
if [[ "x$DOCKER_REPO" == "x" ]]; then
22-
DOCKER_REPO=outflanknl
23-
fi
24-
DOCKER_IMAGE="${DOCKER_REPO}/redelk-logstash"
2521
echo ::set-output name=docker_image::${DOCKER_IMAGE}
26-
echo ::set-output name=docker_repo::${DOCKER_REPO}
2722
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2823
VCS_REF=${GITHUB_SHA::8}
2924
env:
30-
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
25+
DOCKER_IMAGE: ${{ vars.DOCKER_REPO || 'outflanknl' }}/redelk-logstash
3126

3227
- name: Docker meta
3328
id: docker_meta

‎.github/workflows/docker-build-prd-base.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,11 @@ jobs:
1717
- name: Prepare
1818
id: prepare
1919
run: |
20-
DOCKER_REPO="${DOCKER_REPO:-outflanknl}"
21-
DOCKER_IMAGE="${DOCKER_REPO}/redelk-base"
2220
echo ::set-output name=docker_image::${DOCKER_IMAGE}
23-
echo ::set-output name=docker_repo::${DOCKER_REPO}
2421
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2522
VCS_REF=${GITHUB_SHA::8}
2623
env:
27-
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
24+
DOCKER_IMAGE: ${{ vars.DOCKER_REPO || 'outflanknl' }}/redelk-base
2825

2926
- name: Docker meta
3027
id: docker_meta

‎.github/workflows/docker-build-prd-elasticsearch.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,11 @@ jobs:
1717
- name: Prepare
1818
id: prepare
1919
run: |
20-
if [[ "x$DOCKER_REPO" == "x" ]]; then
21-
DOCKER_REPO=outflanknl
22-
fi
23-
DOCKER_IMAGE="${DOCKER_REPO}/redelk-elasticsearch"
2420
echo ::set-output name=docker_image::${DOCKER_IMAGE}
25-
echo ::set-output name=docker_repo::${DOCKER_REPO}
2621
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2722
VCS_REF=${GITHUB_SHA::8}
2823
env:
29-
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
24+
DOCKER_IMAGE: ${{ vars.DOCKER_REPO || 'outflanknl' }}/redelk-elasticsearch
3025

3126
- name: Docker meta
3227
id: docker_meta

‎.github/workflows/docker-build-prd-jupyter.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,11 @@ jobs:
1717
- name: Prepare
1818
id: prepare
1919
run: |
20-
if [[ "x$DOCKER_REPO" == "x" ]]; then
21-
DOCKER_REPO=outflanknl
22-
fi
23-
DOCKER_IMAGE="${DOCKER_REPO}/redelk-jupyter"
2420
echo ::set-output name=docker_image::${DOCKER_IMAGE}
25-
echo ::set-output name=docker_repo::${DOCKER_REPO}
2621
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2722
VCS_REF=${GITHUB_SHA::8}
2823
env:
29-
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
24+
DOCKER_IMAGE: ${{ vars.DOCKER_REPO || 'outflanknl' }}/redelk-jupyter
3025

3126
- name: Docker meta
3227
id: docker_meta

‎.github/workflows/docker-build-prd-kibana.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,11 @@ jobs:
1717
- name: Prepare
1818
id: prepare
1919
run: |
20-
if [[ "x$DOCKER_REPO" == "x" ]]; then
21-
DOCKER_REPO=outflanknl
22-
fi
23-
DOCKER_IMAGE="${DOCKER_REPO}/redelk-kibana"
2420
echo ::set-output name=docker_image::${DOCKER_IMAGE}
25-
echo ::set-output name=docker_repo::${DOCKER_REPO}
2621
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2722
VCS_REF=${GITHUB_SHA::8}
2823
env:
29-
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
24+
DOCKER_IMAGE: ${{ vars.DOCKER_REPO || 'outflanknl' }}/redelk-kibana
3025

3126
- name: Docker meta
3227
id: docker_meta

‎.github/workflows/docker-build-prd-logstash.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,11 @@ jobs:
1717
- name: Prepare
1818
id: prepare
1919
run: |
20-
if [[ "x$DOCKER_REPO" == "x" ]]; then
21-
DOCKER_REPO=outflanknl
22-
fi
23-
DOCKER_IMAGE="${DOCKER_REPO}/redelk-logstash"
2420
echo ::set-output name=docker_image::${DOCKER_IMAGE}
25-
echo ::set-output name=docker_repo::${DOCKER_REPO}
2621
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2722
VCS_REF=${GITHUB_SHA::8}
2823
env:
29-
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
24+
DOCKER_IMAGE: ${{ vars.DOCKER_REPO || 'outflanknl' }}/redelk-logstash
3025

3126
- name: Docker meta
3227
id: docker_meta

0 commit comments

Comments
 (0)