Lenshxm -ind-test

.github/dependabot.yml

@@ -1,11 +1,16 @@
 version: 2
 updates:
-  - package-ecosystem: github-actions
-    directory: /
+  - package-ecosystem: docker
+    directory: devcontainer
     schedule:
       interval: daily
 
   - package-ecosystem: docker
-    directory: images
+    directory: kube-devcontainer
+    schedule:
+      interval: daily
+
+  - package-ecosystem: github-actions
+    directory: /
     schedule:
       interval: daily

.github/workflows/build.yaml

@@ -0,0 +1,80 @@
+name: Build Image
+
+on:
+  push:
+    branches:
+      - lenshxm-ind
+
+  workflow_dispatch:
+    inputs:
+      image:
+        description: Image name
+        type: string
+      version:
+        description: Image version tag
+        type: string
+      frappe-repo:
+        description: Frappe repo
+        type: string
+      frappe-version:
+        description: Frappe branch
+        type: string
+      py-version:
+        description: Python version
+        type: string
+      nodejs-version:
+        description: NodeJS version
+        type: string
+      apps-json-base64:
+        description: base64 encoded string of apps.json
+        type: string
+      context:
+        description: kaniko context
+        type: string
+      dockerfile:
+        description: dockerfile path from context
+        type: string
+      registry-user:
+        description: registry username
+        required: false
+
+    secrets:
+      REGISTRY_PASSWORD:
+        description: registry password
+        required: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Source Build Env
+        id: source-build-env
+        run: |
+          cat ./ci/build.env >> $GITHUB_ENV
+          echo "VERSION=$(cat ./ci/version.txt)" >> $GITHUB_ENV
+          echo "APPS_JSON_BASE64=$(base64 -w 0 ./ci/apps.json)" >> $GITHUB_ENV
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ inputs.registry || env.REGISTRY }}
+          username: ${{ inputs.registry-user || github.actor }}
+          password: ${{ secrets.REGISTRY_PASSWORD || secrets.GITHUB_TOKEN }}
+
+      - uses: int128/kaniko-action@v1
+        with:
+          push: true
+          cache: true
+          kaniko-args: |
+            --build-arg=FRAPPE_PATH=${{ inputs.frappe-repo || env.FRAPPE_REPO }}
+            --build-arg=FRAPPE_BRANCH=${{ inputs.frappe-version || env.FRAPPE_VERSION }}
+            --build-arg=PYTHON_VERSION=${{ inputs.py-version || env.PY_VERSION }}
+            --build-arg=NODE_VERSION=${{ inputs.nodejs-version || env.NODEJS_VERSION }}
+            --build-arg=APPS_JSON_BASE64=${{ inputs.apps-json-base64 || env.APPS_JSON_BASE64 }}
+            --context=${{ inputs.context || env.CONTEXT }}
+            --destination=ghcr.io/${{ github.repository }}/${{ inputs.image || env.IMAGE }}:${{ inputs.version || env.VERSION }}
+            --destination=ghcr.io/${{ github.repository }}/${{ inputs.image || env.IMAGE }}:latest
+          file: ${{ inputs.dockerfile || env.DOCKERFILE }}

.gitlab-ci.yml

@@ -1,67 +1,35 @@
-image: docker:latest
-
 stages:
   - build
-  - deploy
-
-services:
-  - docker:dind
-
-build_latest:
-  stage: build
-  only:
-    - main
-  before_script:
-    # Install os dependencies
-    - apk --update add openssh-client git jq curl
-    # Login to container registry
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
-    # Install buildx
-    - mkdir -p $HOME/.docker/cli-plugins
-    - curl -sSLo $HOME/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-amd64
-    - chmod +x ~/.docker/cli-plugins/docker-buildx
-    - docker buildx create --name ci_build_latest --use
-  script:
-    - ./ci/clone-apps.sh
-    - export FRAPPE_VERSION=$(jq -r .frappe base_versions.json)
-    - export ERPNEXT_VERSION=$(jq -r .erpnext base_versions.json)
-    - export VERSION=latest
-    - export REGISTRY_NAME=${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}
-    - export BACKEND_IMAGE_NAME=worker
-    - export FRONTEND_IMAGE_NAME=nginx
-    - docker buildx bake --push
-    # Cleanup runner
-    - docker buildx stop ci_build_latest
-    - docker buildx rm ci_build_latest
-    - docker volume prune -f
 
 build_version:
   stage: build
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
   only:
     refs:
       - main
-    changes:
-      - version.txt
-  before_script:
-    # Install os dependencies
-    - apk --update add openssh-client git jq curl
-    # Login to container registry
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
-    # Install buildx
-    - mkdir -p $HOME/.docker/cli-plugins
-    - curl -sSLo $HOME/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-amd64
-    - chmod +x ~/.docker/cli-plugins/docker-buildx
-    - docker buildx create --name ci_build_version --use
   script:
-    - ./ci/clone-apps.sh
-    - export FRAPPE_VERSION=$(jq -r .frappe base_versions.json)
-    - export ERPNEXT_VERSION=$(jq -r .erpnext base_versions.json)
-    - export VERSION=$(cat version.txt)
-    - export REGISTRY_NAME=${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}
-    - export BACKEND_IMAGE_NAME=worker
-    - export FRONTEND_IMAGE_NAME=nginx
-    - docker buildx bake --push
-    # Cleanup runner
-    - docker buildx stop ci_build_version
-    - docker buildx rm ci_build_version
-    - docker volume prune -f
+    - |
+      source ./ci/build.env
+      mkdir -p /kaniko/.docker
+      export IMAGE_NAME=${CI_REGISTRY:-${REGISTRY}}/${CI_PROJECT_NAMESPACE:-${PROJECT_NAMESPACE}}/${CI_PROJECT_NAME:-${PROJECT_NAME}}/${IMAGE_NAME:-${IMAGE}}
+      export BASIC_AUTH=$(echo -n ${CI_REGISTRY_USER}:${CI_JOB_TOKEN} | base64)
+      echo "{
+        \"auths\": {
+          \"${CI_REGISTRY:-${REGISTRY}}\":{
+            \"auth\": \"${BASIC_AUTH}\"
+            }
+          }
+        }" > /kaniko/.docker/config.json
+      /kaniko/executor \
+        --dockerfile=${CONTAINERFILE:-${DOCKERFILE}} \
+        --context=${BUILD_CONTEXT:-${CONTEXT}} \
+        --build-arg=FRAPPE_PATH=${FRAPPE_PATH:-${FRAPPE_REPO}} \
+        --build-arg=FRAPPE_BRANCH=${FRAPPE_BRANCH:-${FRAPPE_VERSION}} \
+        --build-arg=PYTHON_VERSION=${PYTHON_VERSION:-${PY_VERSION}} \
+        --build-arg=NODE_VERSION=${NODE_VERSION:-${NODEJS_VERSION}} \
+        --build-arg=APPS_JSON_BASE64=${APPS_JSON_BASE64:-$(base64 -w 0 ./ci/apps.json)} \
+        --destination=${IMAGE_NAME}:${VERSION:-$(cat ./ci/version.txt)} \
+        --destination=${IMAGE_NAME}:latest \
+        --cache=true

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2021 Castlecraft Ecommerce Pvt. Ltd.
+Copyright 2023 Castlecraft Ecommerce Pvt. Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -1,54 +1,7 @@
-### Introduction
+## Topics
 
-- This repo is based on official frappe_docker documentation to build [custom apps](https://github.com/frappe/frappe_docker/blob/main/custom_app/README.md).
-- Fork this repo to build your own image with ERPNext and list of custom Frappe apps.
-- Change the `frappe` and `erpnext` versions in `base_versions.json` to use them as base. These values correspond to tags and branch names on the github frappe and erpnext repo. e.g. `version-14`, `v14.18.1`
-- Change `ci/clone-apps.sh` script to clone your private and public apps. Read comments in the file to update it as per need. This repo will install following apps:
-  - https://github.com/castlecraft/cfe
-  - https://github.com/castlecraft/microsoft_integration
-- Change `images/backend.Dockerfile` to copy and install required apps with `install-app`.
-- Change `images/frontend.Dockerfile` to install ERPNext if required.
-- Change `docker-bake.hcl` for builds as per need.
-- Workflows from `.github/workflows` will build latest or tagged images using GitHub. Change as per need.
-- Runner will build images automatically and publish to container registry.
-- Use `gitlab-ci.yml` in case of Gitlab CI.
-
-### Manually Build images
-
-Execute from root of app repo
-
-Clone,
-
-```shell
-./ci/clone-apps.sh
-```
-
-Set environment variables,
-
-- `FRAPPE_VERSION` set to use frappe version during building images. Default is `version-14`.
-- `ERPNEXT_VERSION` set to use erpnext version during building images. Default is `version-14`.
-- `VERSION` set the tag version. Default is `latest`.
-- `REGISTRY_NAME` set the registry name. Default is `custom_app`.
-- `BACKEND_IMAGE_NAME` set worker image name. Default is `custom_worker`.
-- `FRONTEND_IMAGE_NAME` set nginx image name. Default is `custom_nginx`.
-
-Build,
-
-```shell
-docker buildx bake -f docker-bake.hcl --load
-```
-
-Note:
-
-- Use `docker buildx bake --load` to load images for usage with docker.
-- Use `docker buildx bake --push` to push images to registry.
-- Use `docker buildx bake --help` for more information.
-- Change version in `version.txt` to build tagged images from the changed version.
-
-### Development
-
-Refer development directory to [start development](development/README.md)
-
-### K8s Bench
-
-Refer docs directory to use [Kubernetes Bench Operator](docs/k8s-bench.md)
+- [Frappe apps on Kubernetes](docs/kube-devcontainer.md)
+- [Frappe apps on Docker Swarm](docs/docker-swarm.md)
+- [Custom Devcontainer](docs/devcontainer.md)
+- [Setup Kubernetes cluster with k3s](docs/k3s-cluster.md)
+- [CI Runner Build API](docs/runner-api.md)