From 96b9cc0f448a3edaae52334ceab9bbf5be6c7249 Mon Sep 17 00:00:00 2001
From: Haitao Pan <manbuzhe2009@qq.com>
Date: Mon, 20 Feb 2023 16:35:16 +0800
Subject: [PATCH] oci/app-runner/kube-base-alpine: update

---
 .github/workflows/iac-runner-terraform.yaml   | 31 -------------------
 .gitlab-ci.yml => example/.gitlab-ci.yml      |  0
 {oci => example}/gitlab-templates/base.yml    |  0
 .../gitlab-templates/build-and-push-image.yml |  0
 .../kube-base-alpine/.gitlab-ci.yml           | 16 ++++++++++
 .../kube-base-alpine}/Dockerfile              |  0
 .../kube-base-alpine}/Makefile                |  0
 .../kube-base-alpine}/README.md               |  0
 .../kube-base-alpine}/ca.crt                  |  0
 .../kube-base-alpine}/repositories            |  0
 10 files changed, 16 insertions(+), 31 deletions(-)
 delete mode 100644 .github/workflows/iac-runner-terraform.yaml
 rename .gitlab-ci.yml => example/.gitlab-ci.yml (100%)
 rename {oci => example}/gitlab-templates/base.yml (100%)
 rename {oci => example}/gitlab-templates/build-and-push-image.yml (100%)
 create mode 100644 oci/app-runner/kube-base-alpine/.gitlab-ci.yml
 rename oci/{ci-runner/alpine => app-runner/kube-base-alpine}/Dockerfile (100%)
 rename oci/{ci-runner/alpine => app-runner/kube-base-alpine}/Makefile (100%)
 rename oci/{ci-runner/alpine => app-runner/kube-base-alpine}/README.md (100%)
 rename oci/{ci-runner/alpine => app-runner/kube-base-alpine}/ca.crt (100%)
 rename oci/{ci-runner/alpine => app-runner/kube-base-alpine}/repositories (100%)

diff --git a/.github/workflows/iac-runner-terraform.yaml b/.github/workflows/iac-runner-terraform.yaml
deleted file mode 100644
index 7f45af6..0000000
--- a/.github/workflows/iac-runner-terraform.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Build & push  ci runner terraform base image
-on:
-  pull_request:
-  push:
-    paths:
-      - 'oci/ci-runner/terraform/main.tf'
-      - 'oci/ci-runner/terraform/Dockerfile'
-      - 'oci/ci-runner/terraform/.terraformrc'
-      - '.github/workflows/iac-runner-terraform.yaml'
-    branches:
-      - main
-
-jobs:
-  base-image:
-    runs-on: ubuntu-latest
-    name: Build ci runner terraform base image
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push alpine image'
-        uses: aevea/action-kaniko@master
-        with:
-          registry: artifact.onwalk.net
-          username: admin 
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          path: './oci/ci-runner/terraform'
-          build_file: 'Dockerfile'
-          image: devops/ci-runner-terraform
-          tag: latest
-          cache: true
-          cache_registry: cache
diff --git a/.gitlab-ci.yml b/example/.gitlab-ci.yml
similarity index 100%
rename from .gitlab-ci.yml
rename to example/.gitlab-ci.yml
diff --git a/oci/gitlab-templates/base.yml b/example/gitlab-templates/base.yml
similarity index 100%
rename from oci/gitlab-templates/base.yml
rename to example/gitlab-templates/base.yml
diff --git a/oci/gitlab-templates/build-and-push-image.yml b/example/gitlab-templates/build-and-push-image.yml
similarity index 100%
rename from oci/gitlab-templates/build-and-push-image.yml
rename to example/gitlab-templates/build-and-push-image.yml
diff --git a/oci/app-runner/kube-base-alpine/.gitlab-ci.yml b/oci/app-runner/kube-base-alpine/.gitlab-ci.yml
new file mode 100644
index 0000000..0ed3c48
--- /dev/null
+++ b/oci/app-runner/kube-base-alpine/.gitlab-ci.yml
@@ -0,0 +1,16 @@
+stages:
+  - build
+
+build-image-job:
+  stage: build
+  image:
+    name: artifact.onwalk.net/k8s/kaniko-executor:debug
+    entrypoint: [""]
+  script:
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"artifact.onwalk.net/k8s\":{\"auth\":\"$(printf "%s:%s" "admin" "${PASSWORD}" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
+    - >-
+      /kaniko/executor
+      --context "${CI_PROJECT_DIR}"
+      --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
+      --destination "artifact.onwalk.net/devops/alpine-ci-runner:latest"
diff --git a/oci/ci-runner/alpine/Dockerfile b/oci/app-runner/kube-base-alpine/Dockerfile
similarity index 100%
rename from oci/ci-runner/alpine/Dockerfile
rename to oci/app-runner/kube-base-alpine/Dockerfile
diff --git a/oci/ci-runner/alpine/Makefile b/oci/app-runner/kube-base-alpine/Makefile
similarity index 100%
rename from oci/ci-runner/alpine/Makefile
rename to oci/app-runner/kube-base-alpine/Makefile
diff --git a/oci/ci-runner/alpine/README.md b/oci/app-runner/kube-base-alpine/README.md
similarity index 100%
rename from oci/ci-runner/alpine/README.md
rename to oci/app-runner/kube-base-alpine/README.md
diff --git a/oci/ci-runner/alpine/ca.crt b/oci/app-runner/kube-base-alpine/ca.crt
similarity index 100%
rename from oci/ci-runner/alpine/ca.crt
rename to oci/app-runner/kube-base-alpine/ca.crt
diff --git a/oci/ci-runner/alpine/repositories b/oci/app-runner/kube-base-alpine/repositories
similarity index 100%
rename from oci/ci-runner/alpine/repositories
rename to oci/app-runner/kube-base-alpine/repositories