Skip to content

Commit 864b8f2

Browse files
committed
Merge branch 'release/1.4.0'
2 parents fd417e3 + 218ce73 commit 864b8f2

File tree

6 files changed

+97
-4
lines changed

6 files changed

+97
-4
lines changed

.github/dependabot.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "docker"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
reviewers:
8+
- hingew
9+
- pehbehbeh
10+
assignees:
11+
- pehbehbeh

.github/workflows/Edge.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Build edge image
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
docker:
10+
runs-on: ubuntu-latest
11+
steps:
12+
-
13+
name: Checkout
14+
uses: actions/checkout@v2
15+
-
16+
name: Set up QEMU
17+
uses: docker/setup-qemu-action@v1
18+
-
19+
name: Set up Docker Buildx
20+
uses: docker/setup-buildx-action@v1
21+
-
22+
name: Login to DockerHub
23+
uses: docker/login-action@v1
24+
with:
25+
username: ${{ secrets.DOCKERHUB_USERNAME }}
26+
password: ${{ secrets.DOCKERHUB_TOKEN }}
27+
-
28+
name: Build and push
29+
uses: docker/build-push-action@v2
30+
with:
31+
context: .
32+
platforms: linux/amd64,linux/arm64
33+
push: true
34+
tags: |
35+
sourceboat/rancher-deploy:edge

.github/workflows/Stable.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Build stable image
2+
3+
on:
4+
push:
5+
tags:
6+
- '*.*.*'
7+
8+
jobs:
9+
docker:
10+
runs-on: ubuntu-latest
11+
steps:
12+
-
13+
name: Checkout
14+
uses: actions/checkout@v2
15+
-
16+
name: Docker meta
17+
id: meta
18+
uses: docker/metadata-action@v3
19+
with:
20+
images: |
21+
sourceboat/rancher-deploy
22+
flavour: |
23+
latest=true
24+
tags: |
25+
type=semver,pattern={{version}}
26+
type=semver,pattern={{major}}.{{minor}}
27+
type=semver,pattern={{major}}
28+
-
29+
name: Set up QEMU
30+
uses: docker/setup-qemu-action@v1
31+
-
32+
name: Set up Docker Buildx
33+
uses: docker/setup-buildx-action@v1
34+
-
35+
name: Login to DockerHub
36+
uses: docker/login-action@v1
37+
with:
38+
username: ${{ secrets.DOCKERHUB_USERNAME }}
39+
password: ${{ secrets.DOCKERHUB_TOKEN }}
40+
-
41+
name: Build and push
42+
uses: docker/build-push-action@v2
43+
with:
44+
context: .
45+
platforms: linux/amd64,linux/arm64
46+
push: true
47+
tags: ${{ steps.meta.outputs.tags }}

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rancher/cli:v2.0.4
1+
FROM rancher/cli2:v2.6.4
22

33
# install dependencies
44
RUN apk update \
@@ -15,7 +15,7 @@ SHELL ["/bin/bash", "-c"]
1515
RUN curl -sL https://sentry.io/get-cli/ | bash
1616

1717
# install kubectl
18-
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/amd64/kubectl \
18+
RUN curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" \
1919
&& mv ./kubectl /usr/local/bin/kubectl
2020

2121
# add helper scripts

LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MIT License
1+
# MIT License
22

33
Copyright (c) Sourceboat GmbH & Co. KG <[email protected]>
44

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ To use this image via GitLab CI add the following to the `.gitlab-ci.yml`:
2626
```yml
2727
deploy:
2828
stage: deploy
29-
image: sourceboat/rancher-deploy:stable
29+
image: sourceboat/rancher-deploy:latest
3030
variables:
3131
RANCHER_URL: https://rancher.example.com
3232
K8S_NAMESPACE: my-namespace-name

0 commit comments

Comments
 (0)