Merge pull request #99 from dodevops/develop

Main Merge

Author: dploeger

.github/workflows/check_commits.yml

@@ -24,7 +24,7 @@ jobs:
                 uses: tim-actions/commit-message-checker-with-regex@v0.3.1
                 with:
                     commits: ${{ steps.get-pr-commits.outputs.commits }}
-                    pattern: '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test){1}(\([\w\-\.]+\))?(!)?: ([\w ])+([\s\S]*)'
+                    pattern: '^(Merge branch ''main'' into develop)|(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test){1}(\([\w\-\.]+\))?(!)?: ([\w ])+([\s\S]*)'
                     error: 'Commit messages do not follow https://www.conventionalcommits.org/en/v1.0.0/'
             -   name: Get Changed Files
                 uses: tj-actions/changed-files@v35.5.6

.github/workflows/image.yml

@@ -70,7 +70,18 @@ jobs:
                 run: |
                     cat build/Dockerfile.prefix > Dockerfile
                     cat "flavour/${{ matrix.flavour.name }}/Dockerfile.flavour" >> Dockerfile
+                    
+                    # Download mo
+                    curl -sSL https://raw.githubusercontent.com/tests-always-included/mo/master/mo -o mo
+                    chmod +x mo
+                    
+                    cat build/Dockerfile.suffix.mo | BUILD_DATE=$(date -Iseconds) FLAVOUR=${{ matrix.flavour.name }} ./mo > build/Dockerfile.suffix
+                    
                     cat build/Dockerfile.suffix >> Dockerfile
+                    
+                    rm mo
+                env:
+                    FLAVOUR: "${{ matrix.flavour.name }}"
 
             -   name: Clean up Docker
                 run: |

.github/workflows/test.yml

@@ -79,7 +79,16 @@ jobs:
                 run: |
                     cat build/Dockerfile.prefix > Dockerfile
                     cat "flavour/${{ matrix.flavour }}/Dockerfile.flavour" >> Dockerfile
+                    
+                    # Download mo
+                    curl -sSL https://raw.githubusercontent.com/tests-always-included/mo/master/mo -o mo
+                    chmod +x mo
+                    
+                    cat build/Dockerfile.suffix.mo | BUILD_DATE=$(date -Iseconds) FLAVOUR=${{ matrix.flavour }} ./mo > build/Dockerfile.suffix
+                    
                     cat build/Dockerfile.suffix >> Dockerfile
+                    
+                    rm mo
             -   name: build flavour container
                 id: build-and-push
                 uses: docker/build-push-action@v4.0.0

README.md

@@ -554,6 +554,10 @@ Installs and configures [Terraform](https://terraform.io)
   than the default is used, the volume-target needs to be adapted to the same directory
 * Environment TERRAFORM_CREDENTIALS_PATH: Volume target for terraform credentials (optional). Defaults to `/terraform`. If something 
   different than the default is used, the volume-target needs to be adapted to the same directory
+* If you used the browser based login in gcloud, you'll probably need to authenticate using the application-default
+  login using the gcloud cli by running
+  
+      gcloud auth application-default login
 
 ### <a id="terragrunt"></a> Terragrunt
 

assets/logo.png

@@ -27,7 +27,7 @@ for FLAVOUR in ${FLAVOURS}
 do
   cat build/Dockerfile.prefix > Dockerfile
   cat "flavour/${FLAVOUR}/Dockerfile.flavour" >> Dockerfile
-  cat build/Dockerfile.suffix >> Dockerfile
+  cat build/Dockerfile.suffix.mo | docker run --rm -i -e FLAVOUR=${FLAVOUR} -e BUILD_DATE=$(date -Iseconds) metal3d/mo >> Dockerfile
   docker build --pull . -t "ghcr.io/dodevops/cloudcontrol-${FLAVOUR}:${TAG}"
 done
 

assets/logo.svg

@@ -1,10 +1,10 @@
 FROM node:lts-slim as cccClientBuild
 
 WORKDIR /build
-COPY ccc/client /build
+COPY ccc-client /build
 RUN npm config set update-notifier false
 RUN npm install
-RUN npm run-script build
+RUN npm run-script build -- --base=/client/
 
 FROM golang:1.19 AS cccBuild
 

build.sh

@@ -0,0 +1,37 @@
+# Features
+
+COPY feature /home/cloudcontrol/feature-installers
+COPY assets/feature-installer-utils.sh /
+
+# CCC
+
+COPY --from=cccBuild /build/ccc /usr/local/ccc/ccc
+RUN chmod +x /usr/local/ccc/ccc
+
+COPY --from=cccClientBuild /build/dist /usr/local/ccc/client
+
+# Cloud control
+
+COPY assets/cloudcontrol.sh /usr/local/bin/cloudcontrol
+RUN chmod +x /usr/local/bin/cloudcontrol
+
+# Chown
+
+RUN chown cloudcontrol -R /home/cloudcontrol
+
+EXPOSE 8080
+USER cloudcontrol
+ENTRYPOINT ["/usr/local/bin/cloudcontrol"]
+WORKDIR /home/cloudcontrol
+CMD ["serve"]
+
+# Labels
+
+LABEL io.artifacthub.package.readme-url=https://github.com/dodevops/cloudcontrol
+LABEL org.opencontainers.image.created={{BUILD_DATE}}
+LABEL org.opencontainers.image.description="The cloud engineer's toolbox - {{FLAVOUR}} flavour"
+LABEL org.opencontainers.image.documentation=https://github.com/dodevops/cloudcontrol
+LABEL org.opencontainers.image.source=https://github.com/dodevops/cloudcontrol
+LABEL org.opencontainers.image.title="cloudcontrol-{{FLAVOUR}}"
+LABEL org.opencontainers.image.url=https://github.com/dodevops/cloudcontrol
+LABEL org.opencontainers.image.vendor="DO! DevOps"