Merge pull request #1875 from OpenC3/docker_build_cloud

Docker build cloud
OpenC3 · Feb 5, 2025 · ff0c1b7 · ff0c1b7
2 parents 6414a39 + f3d1368
commit ff0c1b7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -50,11 +50,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install build
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -66,6 +61,12 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: cloud
+          endpoint: "openc3inc/github-builder"
+          install: true
       - name: Update version to desired
         run: ruby openc3_set_versions.rb
         working-directory: scripts/release

diff --git a/...c3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/lib/inst_cmd_validator.rb b/...c3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/lib/inst_cmd_validator.rb
@@ -22,6 +22,7 @@ class InstCmdValidator < OpenC3::CommandValidator
   def pre_check(command)
     # Record the current value of CMD_ACPT_CNT for comparison in post_check
     @cmd_acpt_cnt = tlm("<%= target_name %> HEALTH_STATUS CMD_ACPT_CNT")
+    @cmd_acpt_cnt ||= 0 # If the telemetry value is nil, set it to 0
     return [true, nil]
   end
 

diff --git a/openc3-ruby/Dockerfile b/openc3-ruby/Dockerfile
@@ -13,8 +13,6 @@ ARG ALPINE_VERSION
 ARG APK_URL
 ARG RUBYGEMS_URL
 ARG PYPI_URL=https://pypi.org
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
 
 ENV ALPINE_VERSION=${ALPINE_VERSION}
 ENV APK_URL=${APK_URL}
@@ -83,8 +81,8 @@ RUN apk update \
   # These need to be installed with the --platform flag to avoid errors on linux-musl
   # See: https://github.com/protocolbuffers/protobuf/issues/16853#issuecomment-2583135716
   # Should be fixed April 2025
-  && gem install google-protobuf --platform $TARGETPLATFORM \
-  && gem install grpc --platform $TARGETPLATFORM \
+  && gem install google-protobuf --platform ruby \
+  && gem install grpc --platform ruby \
   && gem cleanup \
   && bundle config build.nokogiri --use-system-libraries \
   && bundle config git.allow_insecure true \

diff --git a/openc3/lib/openc3/version.rb b/openc3/lib/openc3/version.rb
@@ -7,7 +7,7 @@ module Version
     MINOR = '1'
     PATCH = '0'
     OTHER = ''
-    BUILD = 'b183d992af0e7da97530615e3b68aceb3c8bc2da'
+    BUILD = 'f288cfa9fae9dfc360234a69fe0dfe2137370046'
   end
   VERSION = '6.1.0'
   GEM_VERSION = '6.1.0'