mkbrut 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbe2cf6d997397c741d9b27ca86ee986483ee39bf659504c3035d6e61db39305
-  data.tar.gz: 39e9e0d7bd3b4fd06ff558eeb2d17c35996976e5d30e354196a2a61a99179351
+  metadata.gz: 81529015409ff5aa2042f1b2b9512af6982d06df63acdd99f35b6282a6ef8453
+  data.tar.gz: e3255f2402f04446cae35a170ab7a44d00550d3043e1f5d0da87e82e0fb1aa1e
 SHA512:
-  metadata.gz: 502e73d098c1c4c8e1dfda3faf1333b70815edf8b1a5b56cc0e4f32ea4730ae6127d58aeaa0ddd6f7b8d355335facedbe0f57b7ae6abb166c2c8cfca1ae8db7f
-  data.tar.gz: 0da67c35c1b15c0c039b4cda01fd3e6ed2a446a273e020b208ec4c8eb68a3b42dcb4ec1f3a9216a19d41550f27b3be6d03a9636d683dc571559f3147cdc9c90c
+  metadata.gz: 38158daa3dc047418f629588f70caca2a8af3b2d7bf045598edd847898d3bff2877d5b460238a36275fa237f5ad2e7caa33bb6717fb6016ee62d92480d81b1f0
+  data.tar.gz: d6f12fd7e888bb8b5d44587a779a20c91f0dd1fa9205c878ac3ec422cc8908ea12c5dee7c03defdd528dc482157f4e47925aaa966c93061617c2a39b1a1dd61f

data/lib/mkbrut/version.rb

@@ -1,3 +1,3 @@
 module MKBrut
-  VERSION = "0.9.0"
+  VERSION = "0.9.2"
 end

data/templates/Base/Dockerfile.dx

@@ -38,6 +38,7 @@ RUN apt-get -y clean && \
       curl \
       gnupg \
       lsb-release \
+      postgresql-common  \
       rsync \
       vim
 
@@ -106,8 +107,7 @@ RUN install -m 0755 -d /etc/apt/keyrings && \
 #
 # Also note that the version here should match the version set up in
 # docker-compose.dx.yml
-RUN sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
-    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
+RUN /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && \
     apt-get update && \
     apt-get -y install postgresql-client-16
 

data/templates/segments/Heroku/deploy/Dockerfile

@@ -44,20 +44,19 @@ RUN apt-get update --quiet --yes && \
       gnupg \
       libjemalloc2 \
       lsb-release \
+      postgresql-common \
       rsync \
-      wget && \
-		rm -rf /var/lib/apt/lists /var/cache/apt/archives
+      wget
 
 # Install the PostgreSQL client.  The latest version is not available
 # from Debian, so we set up our own. This should match what's in Dockerfile.dx
 # and ideally the version of Postgres used in production.
 #
 # Incancation is based on: https://www.postgresql.org/download/linux/debian/
-RUN sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
-    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
+RUN /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && \
     apt-get update && \
     apt-get --yes --quiet install postgresql-client-16 && \
-		rm -rf /var/lib/apt/lists /var/cache/apt/archives
+		rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
 
 # Set basic env vars for production
 ENV RACK_ENV="production" \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mkbrut
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Dave Copeland