Merge pull request #17 from runwaylab/multi-arch

Multi-Arch Support

.github/workflows/docker.yml

@@ -64,7 +64,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          # platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64
 
       # - name: generate artifact attestation
       #   uses: actions/[email protected]

Dockerfile

@@ -1,4 +1,4 @@
-FROM crystallang/crystal:1.12.1 as builder
+FROM 84codes/crystal:1.12.1-ubuntu-24.04 AS builder
 
 LABEL org.opencontainers.image.title="runway"
 LABEL org.opencontainers.image.description="clearing code for take off"
@@ -34,21 +34,17 @@ COPY . .
 # build the project
 RUN script/build
 
-FROM crystallang/crystal:1.12.1
+FROM 84codes/crystal:1.12.1-ubuntu-24.04
 
 # install runtime dependencies
 RUN apt-get update && apt-get install libssh2-1-dev -y
 
-# create a non-root user for security
-RUN useradd -m nonroot
-USER nonroot
-
 WORKDIR /app
 
 ######### CUSTOM SECTION PER PROJECT #########
 
 # copy the binary from the builder stage
-COPY --from=builder --chown=nonroot:nonroot /app/bin/runway .
+COPY --from=builder /app/bin/runway .
 
 # run the binary
 ENTRYPOINT ["./runway"]

acceptance/Dockerfile

@@ -1,4 +1,4 @@
-FROM crystallang/crystal:1.12.1 as builder
+FROM 84codes/crystal:1.12.1-ubuntu-24.04 AS builder
 
 WORKDIR /app
 
@@ -30,25 +30,18 @@ COPY . .
 # build the project
 RUN script/build
 
-FROM crystallang/crystal:1.12.1
+FROM 84codes/crystal:1.12.1-ubuntu-24.04
 
 # install runtime dependencies
 RUN apt-get update && apt-get install libssh2-1-dev -y
 
-# add curl for healthchecks
-# RUN apt-get update && apt-get install -y curl
-
-# create a non-root user for security
-RUN useradd -m nonroot
-USER nonroot
-
 WORKDIR /app
 
 ######### CUSTOM SECTION PER PROJECT #########
 
 # copy the binary from the builder stage
-COPY --from=builder --chown=nonroot:nonroot /app/acceptance/ssh_server/keys/ /app/acceptance/ssh_server/keys/
-COPY --from=builder --chown=nonroot:nonroot /app/bin/runway .
+COPY --from=builder /app/acceptance/ssh_server/keys/ /app/acceptance/ssh_server/keys/
+COPY --from=builder /app/bin/runway .
 
 # run the binary
 ENTRYPOINT ["./runway"]

script/postinstall

@@ -65,7 +65,7 @@ if [ -f "$DIR/bin/ameba" ]; then
   fi
 fi
 
-if [ "$AMEBA_UP_TO_DATE" = false ]; then
+if [ "$AMEBA_UP_TO_DATE" = false ] && [ "$USE_LINUX_VENDOR" != true ]; then
   echo "building ameba binary"
   cd "$DIR/lib/ameba" && shards build && cp bin/ameba "$DIR/bin/ameba" && cd "$DIR"
 fi