Merge pull request #87 from choria-io/ubuntu_noble

Support ubuntu noble
choria-io · Jul 30, 2024 · ac63eaf · ac63eaf
2 parents 5961552 + a0c3c69
commit ac63eaf
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 5 deletions.
diff --git a/.github/workflows/containers.yaml b/.github/workflows/containers.yaml
@@ -83,6 +83,20 @@ jobs:
           hub_user: ${{ secrets.REGISTRY_RELEASE_USERNAME }}
           hub_password: ${{ secrets.REGISTRY_RELEASE_PASSWORD }}
 
+  noble_go:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - uses: ./.github/actions/build-packager
+        with:
+          file: Dockerfile.noble-go
+          go: ${{ env.GO_VERSION }}
+          tag: focal-go${{ env.TAG }}
+          hub_user: ${{ secrets.REGISTRY_RELEASE_USERNAME }}
+          hub_password: ${{ secrets.REGISTRY_RELEASE_PASSWORD }}
+
   jammy_go:
     runs-on: ubuntu-latest
     steps:

diff --git a/Dockerfile.bionic-go b/Dockerfile.bionic-go
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y \
     rake \
     debhelper \
     git \
-    dh-systemd 
+    dh-systemd
 
 
 RUN wget -q https://dl.google.com/go/go${GOVERSION}.linux-amd64.tar.gz && \
@@ -23,10 +23,10 @@ WORKDIR /build/source
 VOLUME /go
 VOLUME /build/artifacts
 
-ENV RUBYLIB /packager/lib
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin
-ENV GOPATH /go
-ENV GO111MODULE on
+ENV RUBYLIB=/packager/lib
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin
+ENV GOPATH=/go
+ENV GO111MODULE=on
 
 COPY lib /packager/lib/
 COPY bin /packager/bin/

diff --git a/Dockerfile.noble-go b/Dockerfile.noble-go
@@ -0,0 +1,34 @@
+FROM ubuntu:noble
+
+ARG GOVERSION="1.14.10"
+RUN echo -n noble_64 > /etc/packager.txt
+
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y \
+    dpkg-dev \
+    wget \
+    ruby \
+    rake \
+    debhelper \
+    git
+
+
+RUN wget -q https://dl.google.com/go/go${GOVERSION}.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go${GOVERSION}.linux-amd64.tar.gz && \
+    rm -f go${GOVERSION}.linux-amd64.tar.gz
+
+WORKDIR /build/source
+
+VOLUME /go
+VOLUME /build/artifacts
+
+ENV RUBYLIB=/packager/lib
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin
+ENV GOPATH=/go
+ENV GO111MODULE=on
+
+COPY lib /packager/lib/
+COPY bin /packager/bin/
+COPY install-choria.sh /bin
+
+CMD /packager/bin/packager.rb
diff --git a/install-choria.sh b/install-choria.sh
@@ -50,6 +50,11 @@ case "${FLAVOUR?}" in
 
     ;;
 
+  noble_64)
+    wget -O /tmp/puppet.deb http://apt.puppetlabs.com/puppet8-release-noble.deb
+
+    ;;
+
   *)
     echo "Uknown test flavour '${FLAVOUR}'"
     exit 1