Merge pull request #22 from runwaylab/docker-improvements

Docker improvements
runwaylab · May 10, 2024 · b10bdd4 · b10bdd4
2 parents 15cc592 + fb9f4c8
commit b10bdd4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -4,6 +4,17 @@ on:
   pull_request:
     branches:
       - main
+    paths:
+      - "Dockerfile"
+      - "docker-compose.yml"
+      - ".dockerignore"
+      - ".github/workflows/docker.yml"
+      - "acceptance/Dockerfile"
+      - "acceptance/docker-compose.acceptance.yml"
+      - "acceptance/ssh_server/Dockerfile"
+      - ".crystal-version"
+      - "shard.yml"
+      - "shard.lock"
   push:
     branches:
       - main
@@ -37,9 +48,6 @@ jobs:
           tags: |
             type=ref,event=branch
             type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
             type=semver,pattern=v{{version}}
             type=sha
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,4 @@
+# https://github.com/84codes/crystal-container-images
 FROM 84codes/crystal:1.12.1-ubuntu-24.04 AS builder
 
 LABEL org.opencontainers.image.title="runway"
@@ -34,10 +35,11 @@ COPY . .
 # build the project
 RUN script/build
 
-FROM 84codes/crystal:1.12.1-ubuntu-24.04
+# https://github.com/phusion/baseimage-docker
+FROM ghcr.io/phusion/baseimage:noble-1.0.0
 
 # install runtime dependencies
-RUN apt-get update && apt-get install libssh2-1-dev -y
+RUN apt-get update && apt-get install libssh2-1-dev libevent-dev -y
 
 WORKDIR /app
 

diff --git a/README.md b/README.md
@@ -11,6 +11,7 @@
   <a href="https://github.com/runwayapp/runway/actions/workflows/acceptance.yml"><img src="https://github.com/runwayapp/runway/actions/workflows/acceptance.yml/badge.svg?event=push" alt="acceptance"/></a>
   <a href="https://github.com/runwayapp/runway/actions/workflows/build.yml"><img src="https://github.com/runwayapp/runway/actions/workflows/build.yml/badge.svg?event=push" alt="build"/></a>
   <a href="https://github.com/runwaylab/runway/actions/workflows/docker.yml/badge.svg"><img src="https://github.com/runwaylab/runway/actions/workflows/docker.yml/badge.svg?event=push" alt="build"/></a>
+  <a href="https://github.com/runwaylab/runway/actions/workflows/release.yml/badge.svg"><img src="https://github.com/runwaylab/runway/actions/workflows/release.yml/badge.svg?event=push" alt="release"/></a>
 </p>
 
 <p align="center">

diff --git a/acceptance/Dockerfile b/acceptance/Dockerfile
@@ -1,3 +1,4 @@
+# https://github.com/84codes/crystal-container-images
 FROM 84codes/crystal:1.12.1-ubuntu-24.04 AS builder
 
 WORKDIR /app
@@ -30,10 +31,11 @@ COPY . .
 # build the project
 RUN script/build
 
-FROM 84codes/crystal:1.12.1-ubuntu-24.04
+# https://github.com/phusion/baseimage-docker
+FROM ghcr.io/phusion/baseimage:noble-1.0.0
 
 # install runtime dependencies
-RUN apt-get update && apt-get install libssh2-1-dev -y
+RUN apt-get update && apt-get install libssh2-1-dev libevent-dev -y
 
 WORKDIR /app
 

diff --git a/src/version.cr b/src/version.cr
@@ -1,3 +1,3 @@
 module Runway
-  VERSION = "v0.0.3"
+  VERSION = "v0.0.4"
 end