Skip to content

Commit

Permalink
Merge branch 'release/1.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pehbehbeh committed Mar 25, 2022
2 parents fd417e3 + 218ce73 commit 864b8f2
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 4 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "daily"
reviewers:
- hingew
- pehbehbeh
assignees:
- pehbehbeh
35 changes: 35 additions & 0 deletions .github/workflows/Edge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Build edge image

on:
push:
branches:
- develop

jobs:
docker:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v2
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
-
name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v2
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: |
sourceboat/rancher-deploy:edge
47 changes: 47 additions & 0 deletions .github/workflows/Stable.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Build stable image

on:
push:
tags:
- '*.*.*'

jobs:
docker:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v2
-
name: Docker meta
id: meta
uses: docker/metadata-action@v3
with:
images: |
sourceboat/rancher-deploy
flavour: |
latest=true
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
-
name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v2
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rancher/cli:v2.0.4
FROM rancher/cli2:v2.6.4

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

# install kubectl
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/amd64/kubectl \
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" \
&& mv ./kubectl /usr/local/bin/kubectl

# add helper scripts
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MIT License
# MIT License

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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ To use this image via GitLab CI add the following to the `.gitlab-ci.yml`:
```yml
deploy:
stage: deploy
image: sourceboat/rancher-deploy:stable
image: sourceboat/rancher-deploy:latest
variables:
RANCHER_URL: https://rancher.example.com
K8S_NAMESPACE: my-namespace-name
Expand Down

0 comments on commit 864b8f2

Please sign in to comment.