Install CLI (#9)

eclipse-velocitas · Jan 11, 2023 · 310c666 · 310c666
1 parent 8ab1ec2
commit 310c666
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 1 deletion.
diff --git a/.github/workflows/build-base-images.yml b/.github/workflows/build-base-images.yml
@@ -33,14 +33,16 @@ jobs:
   build-image:
     strategy:
       matrix:
-        language: [Python, Cpp]
+        language: [Python]
 
     name: "Building image"
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+        with:
+          lfs: true
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2

diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/Dockerfiles/Cpp/Dockerfile b/Dockerfiles/Cpp/Dockerfile
@@ -84,6 +84,11 @@ RUN apt-get --fix-missing update && apt-get upgrade -y && \
         update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-14 100 && \
         update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-14 100
 
+# Install CLI
+ARG TARGETARCH
+COPY ./bin/velocitas-cli-$TARGETARCH /usr/bin/velocitas
+
+# Install devcontainer features
 ADD https://raw.githubusercontent.com/devcontainers/features/7fa90110d762797cc0b1c2fe8fcc028c9b813d56/src/common-utils/install.sh /container/scripts/install-common.sh
 RUN UID="4000" bash /container/scripts/install-common.sh 
 ADD https://raw.githubusercontent.com/devcontainers/features/7fa90110d762797cc0b1c2fe8fcc028c9b813d56/src/docker-in-docker/install.sh /container/scripts/install-dind.sh

diff --git a/Dockerfiles/Python/Dockerfile b/Dockerfiles/Python/Dockerfile
@@ -24,6 +24,11 @@ RUN apt-get update && apt-get upgrade -y && \
         libstdc++6 zlib1g locales sudo ncdu man-db strace gnupg2 \
         build-essential python3-dev
 
+# Install CLI
+ARG TARGETARCH
+COPY ./bin/velocitas-cli-$TARGETARCH /usr/bin/velocitas
+
+# Install devcontainer features
 ADD https://raw.githubusercontent.com/devcontainers/features/7fa90110d762797cc0b1c2fe8fcc028c9b813d56/src/common-utils/install.sh /tmp/scripts/install-common.sh
 RUN UID="4000" bash /tmp/scripts/install-common.sh 
 ADD https://raw.githubusercontent.com/devcontainers/features/7fa90110d762797cc0b1c2fe8fcc028c9b813d56/src/docker-in-docker/install.sh /tmp/scripts/install-dind.sh
@@ -51,3 +56,4 @@ RUN pip3 install -r requirements-app.txt
 RUN pip3 install -r requirements-tests.txt
 # Keep root as last user
 USER root
+WORKDIR /
diff --git a/bin/.gitattributes b/bin/.gitattributes
@@ -0,0 +1,2 @@
+velocitas-cli-amd64 filter=lfs diff=lfs merge=lfs -text
+velocitas-cli-arm64 filter=lfs diff=lfs merge=lfs -text
diff --git a/bin/velocitas-cli-amd64 b/bin/velocitas-cli-amd64
diff --git a/bin/velocitas-cli-arm64 b/bin/velocitas-cli-arm64
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		velocitas-cli-amd64 filter=lfs diff=lfs merge=lfs -text
		velocitas-cli-arm64 filter=lfs diff=lfs merge=lfs -text