Remove devcontainer dependency

mniedermaier · Feb 2, 2025 · 4fd060d · 4fd060d
1 parent c1214a8
commit 4fd060d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/devContainer.yml b/.github/workflows/devContainer.yml
@@ -27,16 +27,16 @@ jobs:
           submodules: recursive
 
       - name: "Create environment files"
-        run: .devcontainer/prepare-env.sh
+        run: .devcontainer/prepare-env.sh && docker compose -f .devcontainer/raspberry/docker-compose.yml run dev /CybICS/software/build.sh
 
-      - name: run tests software
-        uses: devcontainers/ci@v0.3
-        with:
-          configFile: .devcontainer/raspberry/devcontainer.json
-          env: .devcontainer/raspberry/.env
-          runCmd: |
-            docker ps
-            software/build.sh
+      # - name: run tests software
+      #   uses: devcontainers/ci@v0.3
+      #   with:
+      #     configFile: .devcontainer/raspberry/devcontainer.json
+      #     env: .devcontainer/raspberry/.env
+      #     runCmd: |
+      #       docker ps
+      #       software/build.sh
 
   stm32:
     name: Run devcontainer test stm32

diff --git a/software/build.sh b/software/build.sh
@@ -8,8 +8,8 @@ docker buildx ls | grep -q $name && docker buildx use $name
 docker buildx ls | grep -q $name || docker buildx create  --use --config config.toml --name $name
 docker buildx inspect --bootstrap
 
-docker buildx build --platform linux/arm64 -t 172.17.0.1:5000/cybics-hwio-raspberry:latest --push ./hwio-raspberry
 docker buildx build --platform linux/arm64 -t 172.17.0.1:5000/cybics-openplc:latest --push ./OpenPLC
+docker buildx build --platform linux/arm64 -t 172.17.0.1:5000/cybics-hwio-raspberry:latest --push ./hwio-raspberry
 docker buildx build --platform linux/arm64 -t 172.17.0.1:5000/cybics-opcua:latest --push ./opcua
 docker buildx build --platform linux/arm64 -t 172.17.0.1:5000/cybics-fuxa:latest --push ./FUXA
 docker buildx build --platform linux/arm64 -t 172.17.0.1:5000/cybics-stm32:latest --push ./stm32