Skip to content

Commit 8cf37a5

Browse files
eumel8eumel8
committed
Merge main
2 parents 1d32088 + f8a5688 commit 8cf37a5

File tree

16 files changed

+208
-123
lines changed

16 files changed

+208
-123
lines changed

‎.github/dependabot.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
version: 2
6+
updates:
7+
- package-ecosystem: "docker" # See documentation for possible values
8+
directory: "/busybox" # Location of package manifests
9+
schedule:
10+
interval: "weekly"
11+
- package-ecosystem: "docker" # See documentation for possible values
12+
directory: "/etcd-tools" # Location of package manifests
13+
schedule:
14+
interval: "weekly"
15+
- package-ecosystem: "docker" # See documentation for possible values
16+
directory: "/golang" # Location of package manifests
17+
schedule:
18+
interval: "weekly"
19+
- package-ecosystem: "docker" # See documentation for possible values
20+
directory: "/kubectl" # Location of package manifests
21+
schedule:
22+
interval: "weekly"
23+
- package-ecosystem: "docker" # See documentation for possible values
24+
directory: "/mimir" # Location of package manifests
25+
schedule:
26+
interval: "weekly"
27+
- package-ecosystem: "docker" # See documentation for possible values
28+
directory: "/nginx-non-root" # Location of package manifests
29+
schedule:
30+
interval: "weekly"
31+
- package-ecosystem: "docker" # See documentation for possible values
32+
directory: "/s3cmd" # Location of package manifests
33+
schedule:
34+
interval: "weekly"
35+
- package-ecosystem: "docker" # See documentation for possible values
36+
directory: "/socat" # Location of package manifests
37+
schedule:
38+
interval: "weekly"
39+
- package-ecosystem: "docker" # See documentation for possible values
40+
directory: "/utils" # Location of package manifests
41+
schedule:
42+
interval: "weekly"

‎.github/workflows/busybox.yaml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ jobs:
2727
uses: docker/metadata-action@v5
2828
with:
2929
images: |
30-
mtr.devops.telekom.de/mcsps/busybox
3130
ghcr.io/mcsps/busybox
3231
tags: |
3332
type=ref,event=tag
@@ -42,32 +41,32 @@ jobs:
4241
uses: docker/setup-qemu-action@v3
4342
- name: Set up Docker Buildx
4443
uses: docker/setup-buildx-action@v3
45-
- name: Login to MTR
46-
uses: docker/login-action@v3
47-
with:
48-
registry: mtr.devops.telekom.de
49-
username: ${{ secrets.MTR_USERNAME }}
50-
password: ${{ secrets.MTR_PASSWORD }}
5144
- name: Login to GitHub Container Registry
5245
uses: docker/login-action@v3
5346
with:
5447
registry: ghcr.io
5548
username: ${{ github.repository_owner }}
5649
password: ${{ secrets.GITHUB_TOKEN }}
57-
- name: Build and push
50+
- name: Build (PR only)
51+
if: github.event_name == 'pull_request'
52+
uses: docker/build-push-action@v5
53+
with:
54+
context: ./busybox
55+
platforms: linux/amd64,linux/arm64
56+
push: false
57+
- name: Build and push (merge only)
58+
if: github.event_name == 'push'
5859
uses: docker/build-push-action@v5
59-
id: build-push
6060
with:
6161
context: ./busybox
6262
platforms: linux/amd64,linux/arm64
6363
push: true
6464
tags: |
65-
mtr.devops.telekom.de/mcsps/busybox:latest
6665
ghcr.io/mcsps/busybox:latest
6766
${{ steps.meta.outputs.tags }}
6867
- name: Sign Push
68+
if: github.event_name == 'push'
6969
run: |
70-
cosign sign --key env://COSIGN_KEY --tlog-upload=false mtr.devops.telekom.de/mcsps/busybox@${{ steps.build-push.outputs.digest }}
7170
cosign sign --key env://COSIGN_KEY --tlog-upload=false ghcr.io/mcsps/busybox@${{ steps.build-push.outputs.digest }}
7271
env:
7372
COSIGN_KEY: ${{secrets.COSIGN_KEY}}

‎.github/workflows/etcd-tools.yaml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ jobs:
2727
uses: docker/metadata-action@v5
2828
with:
2929
images: |
30-
mtr.devops.telekom.de/mcsps/etcd-tools
3130
ghcr.io/mcsps/etcd-tools
3231
tags: |
3332
type=ref,event=tag
@@ -42,32 +41,32 @@ jobs:
4241
uses: docker/setup-qemu-action@v3
4342
- name: Set up Docker Buildx
4443
uses: docker/setup-buildx-action@v3
45-
- name: Login to MTR
46-
uses: docker/login-action@v3
47-
with:
48-
registry: mtr.devops.telekom.de
49-
username: ${{ secrets.MTR_USERNAME }}
50-
password: ${{ secrets.MTR_PASSWORD }}
5144
- name: Login to GitHub Container Registry
5245
uses: docker/login-action@v3
5346
with:
5447
registry: ghcr.io
5548
username: ${{ github.repository_owner }}
5649
password: ${{ secrets.GITHUB_TOKEN }}
57-
- name: Build and push
50+
- name: Build (PR only)
51+
if: github.event_name == 'pull_request'
52+
uses: docker/build-push-action@v5
53+
with:
54+
context: ./etcd-tools
55+
platforms: linux/amd64,linux/arm64
56+
push: false
57+
- name: Build and push (merge only)
58+
if: github.event_name == 'push'
5859
uses: docker/build-push-action@v5
59-
id: build-push
6060
with:
6161
context: ./etcd-tools
6262
platforms: linux/amd64,linux/arm64
6363
push: true
6464
tags: |
65-
mtr.devops.telekom.de/mcsps/etcd-tools:latest
6665
ghcr.io/mcsps/etcd-tools:latest
6766
${{ steps.meta.outputs.tags }}
6867
- name: Sign Push
68+
if: github.event_name == 'push'
6969
run: |
70-
cosign sign --key env://COSIGN_KEY --tlog-upload=false mtr.devops.telekom.de/mcsps/etcd-tools@${{ steps.build-push.outputs.digest }}
7170
cosign sign --key env://COSIGN_KEY --tlog-upload=false ghcr.io/mcsps/etcd-tools@${{ steps.build-push.outputs.digest }}
7271
env:
7372
COSIGN_KEY: ${{secrets.COSIGN_KEY}}

‎.github/workflows/golang.yaml‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,8 @@ name: Build Image golang
22

33
on:
44
push:
5-
branches:
6-
- dev
7-
tags:
8-
- "*"
95
paths:
106
- 'golang/*'
11-
schedule:
12-
- cron: "15 4 1 * *"
137

148
jobs:
159
build:
@@ -27,13 +21,10 @@ jobs:
2721
uses: docker/metadata-action@v5
2822
with:
2923
images: |
30-
mtr.devops.telekom.de/mcsps/golang
3124
ghcr.io/mcsps/golang
3225
tags: |
33-
type=ref,event=tag
34-
type=ref,event=branch
35-
type=ref,event=pr
3626
type=raw,value=latest
27+
type=semver,pattern={{version}},value=1.25.0 # change also in the Dockerfile
3728
- name: Install Cosign
3829
uses: sigstore/cosign-installer@main
3930
with:
@@ -42,32 +33,32 @@ jobs:
4233
uses: docker/setup-qemu-action@v3
4334
- name: Set up Docker Buildx
4435
uses: docker/setup-buildx-action@v3
45-
- name: Login to MTR
46-
uses: docker/login-action@v3
47-
with:
48-
registry: mtr.devops.telekom.de
49-
username: ${{ secrets.MTR_USERNAME }}
50-
password: ${{ secrets.MTR_PASSWORD }}
5136
- name: Login to GitHub Container Registry
5237
uses: docker/login-action@v3
5338
with:
5439
registry: ghcr.io
5540
username: ${{ github.repository_owner }}
5641
password: ${{ secrets.GITHUB_TOKEN }}
57-
- name: Build and push
42+
- name: Build (PR only)
43+
if: github.event_name == 'pull_request'
44+
uses: docker/build-push-action@v5
45+
with:
46+
context: ./golang
47+
platforms: linux/amd64,linux/arm64
48+
push: false
49+
- name: Build and push (merge only)
50+
if: github.event_name == 'push'
5851
uses: docker/build-push-action@v5
59-
id: build-push
6052
with:
6153
context: ./golang
6254
platforms: linux/amd64,linux/arm64
6355
push: true
6456
tags: |
65-
mtr.devops.telekom.de/mcsps/golang:latest
6657
ghcr.io/mcsps/golang:latest
6758
${{ steps.meta.outputs.tags }}
6859
- name: Sign Push
60+
if: github.event_name == 'push'
6961
run: |
70-
cosign sign --key env://COSIGN_KEY --tlog-upload=false mtr.devops.telekom.de/mcsps/golang@${{ steps.build-push.outputs.digest }}
7162
cosign sign --key env://COSIGN_KEY --tlog-upload=false ghcr.io/mcsps/golang@${{ steps.build-push.outputs.digest }}
7263
env:
7364
COSIGN_KEY: ${{secrets.COSIGN_KEY}}

‎.github/workflows/kubectl.yaml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Build Image kubectl
2+
3+
on:
4+
push:
5+
paths:
6+
- 'kubectl/*'
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
permissions:
12+
contents: read
13+
packages: write
14+
attestations: write
15+
id-token: write
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v4
19+
- name: Docker meta
20+
id: meta
21+
uses: docker/metadata-action@v5
22+
with:
23+
images: |
24+
ghcr.io/mcsps/kubectl
25+
tags: |
26+
type=semver,pattern={{version}},value=v1.35.0 # change also in the Dockerfile
27+
type=semver,pattern={{major}}.{{minor}},value=v1.35.0 # change also in the Dockerfile
28+
- name: Install Cosign
29+
uses: sigstore/cosign-installer@main
30+
with:
31+
cosign-release: "v2.4.0"
32+
- name: Set up QEMU
33+
uses: docker/setup-qemu-action@v3
34+
- name: Set up Docker Buildx
35+
uses: docker/setup-buildx-action@v3
36+
- name: Login to GitHub Container Registry
37+
uses: docker/login-action@v3
38+
with:
39+
registry: ghcr.io
40+
username: ${{ github.repository_owner }}
41+
password: ${{ secrets.GITHUB_TOKEN }}
42+
- name: Build (PR only)
43+
if: github.event_name == 'pull_request'
44+
uses: docker/build-push-action@v5
45+
with:
46+
context: ./kubectl
47+
platforms: linux/amd64,linux/arm64
48+
push: false
49+
- name: Build and push (merge only)
50+
if: github.event_name == 'push'
51+
uses: docker/build-push-action@v5
52+
with:
53+
context: ./kubectl
54+
platforms: linux/amd64,linux/arm64
55+
push: true
56+
tags: |
57+
ghcr.io/mcsps/kubectl:latest
58+
${{ steps.meta.outputs.tags }}
59+
- name: Sign Push
60+
if: github.event_name == 'push'
61+
run: |
62+
cosign sign --key env://COSIGN_KEY --tlog-upload=false ghcr.io/mcsps/kubectl@${{ steps.build-push.outputs.digest }}
63+
env:
64+
COSIGN_KEY: ${{secrets.COSIGN_KEY}}

‎.github/workflows/mimir.yaml‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,8 @@ name: Build Image mimir
22

33
on:
44
push:
5-
branches:
6-
- dev
7-
tags:
8-
- "*"
95
paths:
106
- 'mimir/*'
11-
schedule:
12-
- cron: "15 4 1 * *"
137

148
jobs:
159
build:
@@ -27,13 +21,10 @@ jobs:
2721
uses: docker/metadata-action@v5
2822
with:
2923
images: |
30-
mtr.devops.telekom.de/mcsps/mimir
3124
ghcr.io/mcsps/mimir
3225
tags: |
33-
type=ref,event=tag
34-
type=ref,event=branch
35-
type=ref,event=pr
3626
type=raw,value=latest
27+
type=semver,pattern={{version}},value=3.0.0 # change also in the Dockerfile
3728
- name: Install Cosign
3829
uses: sigstore/cosign-installer@main
3930
with:
@@ -42,32 +33,32 @@ jobs:
4233
uses: docker/setup-qemu-action@v3
4334
- name: Set up Docker Buildx
4435
uses: docker/setup-buildx-action@v3
45-
- name: Login to MTR
46-
uses: docker/login-action@v3
47-
with:
48-
registry: mtr.devops.telekom.de
49-
username: ${{ secrets.MTR_USERNAME }}
50-
password: ${{ secrets.MTR_PASSWORD }}
5136
- name: Login to GitHub Container Registry
5237
uses: docker/login-action@v3
5338
with:
5439
registry: ghcr.io
5540
username: ${{ github.repository_owner }}
5641
password: ${{ secrets.GITHUB_TOKEN }}
57-
- name: Build and push
42+
- name: Build (PR only)
43+
if: github.event_name == 'pull_request'
44+
uses: docker/build-push-action@v5
45+
with:
46+
context: ./mimir
47+
platforms: linux/amd64,linux/arm64
48+
push: false
49+
- name: Build and push (merge only)
50+
if: github.event_name == 'push'
5851
uses: docker/build-push-action@v5
59-
id: build-push
6052
with:
6153
context: ./mimir
6254
platforms: linux/amd64,linux/arm64
6355
push: true
6456
tags: |
65-
mtr.devops.telekom.de/mcsps/mimir:latest
6657
ghcr.io/mcsps/mimir:latest
6758
${{ steps.meta.outputs.tags }}
6859
- name: Sign Push
60+
if: github.event_name == 'push'
6961
run: |
70-
cosign sign --key env://COSIGN_KEY --tlog-upload=false mtr.devops.telekom.de/mcsps/mimir@${{ steps.build-push.outputs.digest }}
7162
cosign sign --key env://COSIGN_KEY --tlog-upload=false ghcr.io/mcsps/mimir@${{ steps.build-push.outputs.digest }}
7263
env:
7364
COSIGN_KEY: ${{secrets.COSIGN_KEY}}

0 commit comments

Comments
 (0)