Merge pull request #92 from mlibrary/2023-06-05-updates

June 2023 dependency updates.

.github/workflows/build-deploy-release.yaml

@@ -14,7 +14,7 @@ jobs:
     with:
       image_name: ${{ vars.IMAGE_NAME }}
       tag: ${{ github.event.release.tag_name }}
-      dockerfile: Dockerfile.prod
+      dockerfile: Dockerfile
     secrets: inherit
 
   deploy-production:

.github/workflows/build-main.yml

@@ -13,7 +13,7 @@ jobs:
     with:
       image_name: ${{ vars.IMAGE_NAME }}
       tag: ${{ github.sha }}
-      dockerfile: Dockerfile.prod
+      dockerfile: Dockerfile
     secrets: inherit
 
   deploy-testing:

.github/workflows/deploy-production.yaml

@@ -14,7 +14,7 @@ jobs:
     with:
       image_name: ${{ vars.IMAGE_NAME }}
       tag: ${{ github.event.inputs.tag }}
-      dockerfile: Dockerfile.prod
+      dockerfile: Dockerfile
     secrets: inherit
 
   deploy-production:

.github/workflows/manual-deploy-unstable.yaml

@@ -23,7 +23,7 @@ jobs:
     with:
       image_name: ${{ vars.IMAGE_NAME }}
       tag: ${{ github.event.inputs.tag }}
-      dockerfile: Dockerfile.prod
+      dockerfile: Dockerfile
     secrets: inherit
 
   deploy:

Dockerfile

@@ -1,13 +1,9 @@
-ARG RUBY_VERSION=3.2
-FROM ruby:${RUBY_VERSION}
+FROM ruby:3.2 AS development
 
-ARG NPM_VERSION="latest"
 ARG UNAME=app
 ARG UID=1000
 ARG GID=1000
 
-LABEL maintainer="[email protected]"
-
 RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
   apt-transport-https
 
@@ -18,7 +14,7 @@ RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
   vim-tiny
 
 RUN gem install bundler
-RUN npm install -g npm@${NPM_VERSION}
+RUN npm install -g npm
 
 
 RUN groupadd -g ${GID} -o ${UNAME}
@@ -32,3 +28,16 @@ ENV BUNDLE_PATH /gems
 WORKDIR /app
 
 CMD ["bundle", "exec", "rackup", "-p", "4567", "--host", "0.0.0.0"]
+
+
+
+FROM development AS production
+
+ENV BUNDLE_WITHOUT development:test
+
+COPY --chown=${UID}:${GID} . /app
+
+RUN bundle install 
+
+RUN npm install
+RUN npm run build

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
-    anyway_config (2.4.0)
+    anyway_config (2.4.1)
       ruby-next-core (>= 0.14.0)
     ast (2.4.2)
     byebug (11.1.3)
@@ -15,7 +15,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dry-initializer (3.1.1)
-    faraday (2.7.4)
+    faraday (2.7.5)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
@@ -43,7 +43,7 @@ GEM
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
     public_suffix (5.0.1)
-    puma (6.2.2)
+    puma (6.3.0)
       nio4r (~> 2.0)
     rack (2.2.7)
     rack-protection (3.0.6)
@@ -69,7 +69,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.50.2)
+    rubocop (1.52.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
@@ -79,9 +79,9 @@ GEM
       rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.1)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-performance (1.16.0)
+    rubocop-performance (1.18.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-next-core (0.15.3)
@@ -104,18 +104,18 @@ GEM
       rack-protection (= 3.0.6)
       sinatra (= 3.0.6)
       tilt (~> 2.0)
-    standard (1.28.2)
+    standard (1.29.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.50.2)
+      rubocop (~> 1.52.0)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.0.1)
-    standard-custom (1.0.0)
+      standard-performance (~> 1.1.0)
+    standard-custom (1.0.1)
       lint_roller (~> 1.0)
-    standard-performance (1.0.1)
+    standard-performance (1.1.0)
       lint_roller (~> 1.0)
-      rubocop-performance (~> 1.16.0)
-    tilt (2.1.0)
+      rubocop-performance (~> 1.18.0)
+    tilt (2.2.0)
     unicode-display_width (2.4.2)
     webmock (3.18.1)
       addressable (>= 2.8.0)
@@ -155,4 +155,4 @@ DEPENDENCIES
   yabeda-puma-plugin
 
 BUNDLED WITH
-   2.4.12
+   2.4.13

docker-compose.yml

@@ -1,8 +1,10 @@
-version: '3'
+version: '3.8'
 
 services:
   web:
-    build: .
+    build: 
+      context: .
+      target: development
     ports:
       - "4567:4567"
       - "9394:9394"

package.json

@@ -22,7 +22,7 @@
   "homepage": "https://github.com/mlibrary/catalog-browse#readme",
   "devDependencies": {
     "cssnano": "^6.0.1",
-    "postcss": "^8.4.23",
+    "postcss": "^8.4.24",
     "postcss-cli": "^10.1.0",
     "postcss-import": "^15.1.0"
   }