Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update enigma workflow to build arm and amd based images #12

Merged
merged 4 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ ENV TERRAFORM_VERSION=1.9.5
ENV ANSIBLE_VERSION=10.3.0
ENV LINT_VERSION=4.1.0
ENV KUBECTL_VERSION=1.31.0
ENV HELM_VERSION=3.15.4
ENV HELM_VERSION=3.16.1
ENV AZURE_CLI_VERSION=2.64.0-1~jammy
ENV AWS_CLI_VERSION=2.17.47
ENV AWS_CLI_VERSION=2.17.49
ENV K9s_Version=0.32.5
ENV GCLOUD_VERSION=490.0.0
ENV GCLOUD_VERSION=491.0.0
ENV KUI_Version=13.1.4
ENV KUBECTX_VERSION=0.9.4
ENV KUBENS_VERSION=0.9.4
Expand Down
13 changes: 13 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,17 @@ updates:
reviewers:
- "approvers"
# Allow up to 3 open pull requests for pip dependencies
open-pull-requests-limit: 3

- package-ecosystem: "docker" # See documentation for possible values
directory: "./" # Location of package manifests
schedule:
interval: "weekly"
# Add assignees
assignees:
- "clouddrove-ci"
# Add reviewer
reviewers:
- "approvers"
# Allow up to 3 open pull requests for pip dependencies
open-pull-requests-limit: 3
42 changes: 20 additions & 22 deletions .github/workflows/enigma-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,33 @@ jobs:
id-token: 'write'
env:
DOCKER_IMAGE: devops-machine
DOCKER_TAG: ghcr.io/${{ github.repository }}:${{ github.ref_name }}
DOCKER_TAG_ARM64: ghcr.io/${{ github.repository }}:${{ github.ref_name }}-arm64
DOCKER_TAG_AMD64: ghcr.io/${{ github.repository }}:${{ github.ref_name }}-amd64
PROVIDER: github

BUILD_ARCHITECTURE_ARM64: arm64
BUILD_ARCHITECTURE_AMD64: amd64
PUBLISH: 'true'

steps:
- name: Checkout code
uses: actions/[email protected]

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build Docker Image
uses: clouddrove/[email protected]

- name: Build and Publish Docker Image
uses: clouddrove/[email protected]
with:
command: bake
command: build-publish
DOCKER_IMAGE: ${{ env.DOCKER_IMAGE }}
DOCKER_TAG: ${{ env.DOCKER_TAG }}
DOCKER_TAG: ${{ env.DOCKER_TAG_ARM64 }}
BUILD_ARCHITECTURE: ${{ env.BUILD_ARCHITECTURE_ARM64 }}
DOCKERFILE_PATH: .docker/Dockerfile
GITHUB_USERNAME: ${{ github.actor }}
TOKEN: ${{ secrets.GITHUB }}

- name: Publish Docker Image
uses: clouddrove/[email protected]
PUBLISH: ${{ env.PUBLISH }}

- name: Build and Publish Docker Image
uses: clouddrove/[email protected]
with:
command: publish
command: build-publish
DOCKER_IMAGE: ${{ env.DOCKER_IMAGE }}
DOCKER_TAG: ${{ env.DOCKER_TAG }}
DOCKER_TAG: ${{ env.DOCKER_TAG_AMD64 }}
BUILD_ARCHITECTURE: ${{ env.BUILD_ARCHITECTURE_AMD64 }}
DOCKERFILE_PATH: .docker/Dockerfile
GITHUB_USERNAME: ${{ github.actor }}
TOKEN: ${{ secrets.GITHUB }}
PUBLISH: ${{ env.PUBLISH }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ This repository offers a comprehensive Docker-based environment configured with
- **Helm**: v3.15.1
- **Packer**: v1.11.2
- **Kubectl**: v1.31.0
- **AWS CLI**: v2.17.33
- **AWS CLI**: v2.17.47
- **Azure CLI**: v2.63.0
- **GCloud CLI**: v490.0.0
- **K9s**: v0.32.5
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
devops:
container_name: devops
image: clouddrove/devops-machine:0.0.1
image: clouddrove/devops-machine:v0.0.1
mem_limit: 3g
memswap_limit: 3g
cpu_shares: 30
Expand Down