Skip to content

Commit 360b624

Browse files
AnthirianAnthirian
committed
ci: differentiate between secrets and variables
1 parent a05cdae commit 360b624

10 files changed

+23
-25
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2828
VCS_REF=${GITHUB_SHA::8}
2929
env:
30-
DOCKER_REPO: ${{ secrets.DOCKER_REPO }}
30+
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
3131

3232
- name: Docker meta
3333
id: docker_meta
@@ -45,7 +45,7 @@ jobs:
4545
uses: docker/login-action@v1
4646
if: ${{ github.event_name != 'pull_request' }}
4747
with:
48-
username: ${{ secrets.DOCKER_USERNAME }}
48+
username: ${{ vars.DOCKER_USERNAME }}
4949
password: ${{ secrets.DOCKER_PASSWORD }}
5050

5151
- name: Cache Docker layers

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2828
VCS_REF=${GITHUB_SHA::8}
2929
env:
30-
DOCKER_REPO: ${{ secrets.DOCKER_REPO }}
30+
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
3131

3232
- name: Docker meta
3333
id: docker_meta
@@ -45,7 +45,7 @@ jobs:
4545
uses: docker/login-action@v1
4646
if: ${{ github.event_name != 'pull_request' }}
4747
with:
48-
username: ${{ secrets.DOCKER_USERNAME }}
48+
username: ${{ vars.DOCKER_USERNAME }}
4949
password: ${{ secrets.DOCKER_PASSWORD }}
5050

5151
- name: Cache Docker layers

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2828
VCS_REF=${GITHUB_SHA::8}
2929
env:
30-
DOCKER_REPO: ${{ secrets.DOCKER_REPO }}
30+
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
3131

3232
- name: Docker meta
3333
id: docker_meta
@@ -45,7 +45,7 @@ jobs:
4545
uses: docker/login-action@v1
4646
if: ${{ github.event_name != 'pull_request' }}
4747
with:
48-
username: ${{ secrets.DOCKER_USERNAME }}
48+
username: ${{ vars.DOCKER_USERNAME }}
4949
password: ${{ secrets.DOCKER_PASSWORD }}
5050

5151
- name: Cache Docker layers

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2828
VCS_REF=${GITHUB_SHA::8}
2929
env:
30-
DOCKER_REPO: ${{ secrets.DOCKER_REPO }}
30+
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
3131

3232
- name: Docker meta
3333
id: docker_meta
@@ -45,7 +45,7 @@ jobs:
4545
uses: docker/login-action@v1
4646
if: ${{ github.event_name != 'pull_request' }}
4747
with:
48-
username: ${{ secrets.DOCKER_USERNAME }}
48+
username: ${{ vars.DOCKER_USERNAME }}
4949
password: ${{ secrets.DOCKER_PASSWORD }}
5050

5151
- name: Cache Docker layers

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2828
VCS_REF=${GITHUB_SHA::8}
2929
env:
30-
DOCKER_REPO: ${{ secrets.DOCKER_REPO }}
30+
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
3131

3232
- name: Docker meta
3333
id: docker_meta
@@ -45,7 +45,7 @@ jobs:
4545
uses: docker/login-action@v1
4646
if: ${{ github.event_name != 'pull_request' }}
4747
with:
48-
username: ${{ secrets.DOCKER_USERNAME }}
48+
username: ${{ vars.DOCKER_USERNAME }}
4949
password: ${{ secrets.DOCKER_PASSWORD }}
5050

5151
- name: Cache Docker layers

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,23 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v3
1616

1717
- name: Prepare
1818
id: prepare
1919
run: |
20-
if [[ "x$DOCKER_REPO" == "x" ]]; then
21-
DOCKER_REPO=outflanknl
22-
fi
20+
DOCKER_REPO="${DOCKER_REPO:-outflanknl}"
2321
DOCKER_IMAGE="${DOCKER_REPO}/redelk-base"
2422
echo ::set-output name=docker_image::${DOCKER_IMAGE}
2523
echo ::set-output name=docker_repo::${DOCKER_REPO}
2624
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2725
VCS_REF=${GITHUB_SHA::8}
2826
env:
29-
DOCKER_REPO: ${{ secrets.DOCKER_REPO }}
27+
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
3028

3129
- name: Docker meta
3230
id: docker_meta
33-
uses: crazy-max/ghaction-docker-meta@v1
31+
uses: docker/metadata-action@v4
3432
with:
3533
images: ${{ steps.prepare.outputs.docker_image }}
3634

@@ -44,7 +42,7 @@ jobs:
4442
uses: docker/login-action@v1
4543
if: ${{ github.event_name != 'pull_request' }}
4644
with:
47-
username: ${{ secrets.DOCKER_USERNAME }}
45+
username: ${{ vars.DOCKER_USERNAME }}
4846
password: ${{ secrets.DOCKER_PASSWORD }}
4947

5048
- name: Cache Docker layers

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2727
VCS_REF=${GITHUB_SHA::8}
2828
env:
29-
DOCKER_REPO: ${{ secrets.DOCKER_REPO }}
29+
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
3030

3131
- name: Docker meta
3232
id: docker_meta
@@ -44,7 +44,7 @@ jobs:
4444
uses: docker/login-action@v1
4545
if: ${{ github.event_name != 'pull_request' }}
4646
with:
47-
username: ${{ secrets.DOCKER_USERNAME }}
47+
username: ${{ vars.DOCKER_USERNAME }}
4848
password: ${{ secrets.DOCKER_PASSWORD }}
4949

5050
- name: Cache Docker layers

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2727
VCS_REF=${GITHUB_SHA::8}
2828
env:
29-
DOCKER_REPO: ${{ secrets.DOCKER_REPO }}
29+
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
3030

3131
- name: Docker meta
3232
id: docker_meta
@@ -44,7 +44,7 @@ jobs:
4444
uses: docker/login-action@v1
4545
if: ${{ github.event_name != 'pull_request' }}
4646
with:
47-
username: ${{ secrets.DOCKER_USERNAME }}
47+
username: ${{ vars.DOCKER_USERNAME }}
4848
password: ${{ secrets.DOCKER_PASSWORD }}
4949

5050
- name: Cache Docker layers

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2727
VCS_REF=${GITHUB_SHA::8}
2828
env:
29-
DOCKER_REPO: ${{ secrets.DOCKER_REPO }}
29+
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
3030

3131
- name: Docker meta
3232
id: docker_meta
@@ -44,7 +44,7 @@ jobs:
4444
uses: docker/login-action@v1
4545
if: ${{ github.event_name != 'pull_request' }}
4646
with:
47-
username: ${{ secrets.DOCKER_USERNAME }}
47+
username: ${{ vars.DOCKER_USERNAME }}
4848
password: ${{ secrets.DOCKER_PASSWORD }}
4949

5050
- name: Cache Docker layers

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
echo ::set-output name=build_args::BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
2727
VCS_REF=${GITHUB_SHA::8}
2828
env:
29-
DOCKER_REPO: ${{ secrets.DOCKER_REPO }}
29+
DOCKER_REPO: ${{ vars.DOCKER_REPO }}
3030

3131
- name: Docker meta
3232
id: docker_meta
@@ -44,7 +44,7 @@ jobs:
4444
uses: docker/login-action@v1
4545
if: ${{ github.event_name != 'pull_request' }}
4646
with:
47-
username: ${{ secrets.DOCKER_USERNAME }}
47+
username: ${{ vars.DOCKER_USERNAME }}
4848
password: ${{ secrets.DOCKER_PASSWORD }}
4949

5050
- name: Cache Docker layers

0 commit comments

Comments
 (0)