build: disable gem cache and fix workflow

seocahill · May 30, 2023 · c8bafad · c8bafad
1 parent 5fc2945
commit c8bafad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,8 +10,14 @@
 name: Create and publish a Docker image
 
 on:
+  workflow_run:
+    workflows:
+      - Test
+    types:
+      - completed
   push:
-    branches: ['master']
+    branches:
+      - master
 
 env:
   REGISTRY: ghcr.io

diff --git a/.github/workflows/main.yaml → .github/workflows/test.yaml b/.github/workflows/main.yaml → .github/workflows/test.yaml
@@ -1,4 +1,4 @@
-name: Main
+name: Test
 
 on: [push]
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,14 +1,14 @@
 # first stage
-ARG GEM_IMAGE=registry.gitlab.com/abairt/web-application:master
+# ARG GEM_IMAGE=registry.gitlab.com/abairt/web-application:master
 
-FROM ${GEM_IMAGE} as gem-cache
+# FROM ${GEM_IMAGE} as gem-cache
 FROM ruby:3.0-slim as builder
 USER root
 ENV RAILS_ENV="production"
 RUN apt update && apt install -y \
  acl build-essential ca-certificates curl default-libmysqlclient-dev ghostscript git gzip imagemagick libaudit1 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libgcc1 libgcrypt20 libgmp-dev libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libidn2-0 libjemalloc2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmariadb3 libncurses6 libncursesw6  libnghttp2-14 libp11-kit0 libpam0g libpq5 libpsl5 libreadline-dev  librtmp1 libsasl2-2 libsqlite3-0 libsqlite3-dev libssh2-1 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libxml2 libxml2-dev libxslt1-dev netcat netcat-traditional pkg-config procps sqlite3 sudo tar unzip wget zlib1g zlib1g-dev nodejs npm git gosu yui-compressor
 COPY . /app
-COPY --from=gem-cache /app/vendor/bundle /app/vendor/bundle
+# COPY --from=gem-cache /app/vendor/bundle /app/vendor/bundle
 WORKDIR /app
 RUN \
   bundle config set deployment 'true' && \