Fix entrypoint script not executable and test push

ubcuas · Feb 21, 2023 · 1886b61 · 1886b61
1 parent d12940e
commit 1886b61
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -25,7 +25,7 @@ jobs:
       uses: docker/setup-buildx-action@v2
 
     - name: Login to Docker Hub
-      if: ${{ github.event_name != 'pull_request' }}
+      if: true
       uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKER_HUB_USER }}
@@ -36,7 +36,7 @@ jobs:
       with:
         context: x86/
         platforms: linux/amd64
-        push: ${{ github.event_name != 'pull_request' }}
+        push: true
         tags: ubcuas/uasitl:latest
         cache-from: type=gha
         cache-to: type=gha,mode=max

diff --git a/arm/Dockerfile b/arm/Dockerfile
@@ -63,6 +63,7 @@ WORKDIR /copter
 # Need USER set so usermod does not fail...
 # Install all prerequisites now
 COPY install-prereqs-arm.sh /
+# Give execute permissions
 RUN chmod +x /install-prereqs-arm.sh
 RUN USER=nobody /install-prereqs-arm.sh -y
 
@@ -110,7 +111,7 @@ ENV INCREMENTSTEPLON 0.01
 
 # Entrypoint
 COPY startArdupilotSITL.sh /
-# Fix line endings
-RUN sed -i 's/\r$//' startArdupilotSITL.sh
+# Give execute permissions
+RUN chmod +x /startArdupilotSITL.sh
 
 ENTRYPOINT /startArdupilotSITL.sh ${NUMCOPTERS} ${LAT} ${LON} ${ALT} ${DIR} ${INCREMENTSTEPLAT} ${INCREMENTSTEPLON} ${COPTERMODEL} ${SPEEDUP}
diff --git a/x86/Dockerfile b/x86/Dockerfile
@@ -119,7 +119,7 @@ ENV INCREMENTSTEPLON 0.01
 
 # Entrypoint
 COPY startArdupilotSITL.sh /
-# Fix line endings
-RUN sed -i 's/\r$//' startArdupilotSITL.sh
+# Give execute permissions
+RUN chmod +x /startArdupilotSITL.sh
 
 ENTRYPOINT /startArdupilotSITL.sh ${NUMCOPTERS} ${LAT} ${LON} ${ALT} ${DIR} ${INCREMENTSTEPLAT} ${INCREMENTSTEPLON} ${COPTERMODEL} ${SPEEDUP}