Merge branch 'master' into manikowski-docker-airflow-19082024

docker/activemq/5/debian11/5.18/Dockerfile

@@ -22,12 +22,12 @@ FROM marketplace.gcr.io/google/c2d-debian11
 COPY --from=ospo /usr/src /usr/src
 
 # This is release version of ActiveMQ to pull in.
-ENV ACTIVEMQ_VERSION 5.18.3
+ENV ACTIVEMQ_VERSION 5.18.5
 ENV ACTIVEMQ apache-activemq-${ACTIVEMQ_VERSION}
 ENV ACTIVEMQ_FILE ${ACTIVEMQ}-bin.tar.gz
 ENV ACTIVEMQ_DOWNLOAD_URL http://archive.apache.org/dist/activemq/
 
-ENV C2D_RELEASE 5.18.3
+ENV C2D_RELEASE 5.18.5
 
 ENV ACTIVEMQ_TCP=61616 \
     ACTIVEMQ_AMQP=5672 \
@@ -54,7 +54,7 @@ RUN set -ex \
 RUN groupadd -g "${gid}" "${group}" \
     && useradd -u "${uid}" -g "${gid}" -m -s /bin/bash "${user}"
 
-# Download and setup activemq version v5.18.3
+# Download and setup activemq version v5.18.5
 RUN set -x && \
     mkdir -p "${ACTIVEMQ_HOME}" \
     && wget -q "${ACTIVEMQ_DOWNLOAD_URL}/${ACTIVEMQ_VERSION}/${ACTIVEMQ_FILE}" -O "${ACTIVEMQ_FILE}" \

docker/activemq/6/debian11/6.0/Dockerfile → docker/activemq/6/debian11/6.1/Dockerfile

@@ -22,12 +22,12 @@ FROM marketplace.gcr.io/google/c2d-debian11
 COPY --from=ospo /usr/src /usr/src
 
 # This is release version of ActiveMQ to pull in.
-ENV ACTIVEMQ_VERSION 6.0.1
+ENV ACTIVEMQ_VERSION 6.1.3
 ENV ACTIVEMQ apache-activemq-${ACTIVEMQ_VERSION}
 ENV ACTIVEMQ_FILE ${ACTIVEMQ}-bin.tar.gz
 ENV ACTIVEMQ_DOWNLOAD_URL http://archive.apache.org/dist/activemq/
 
-ENV C2D_RELEASE 6.0.1
+ENV C2D_RELEASE 6.1.3
 
 ENV ACTIVEMQ_TCP=61616 \
     ACTIVEMQ_AMQP=5672 \
@@ -54,7 +54,7 @@ RUN set -ex \
 RUN groupadd -g "${gid}" "${group}" \
     && useradd -u "${uid}" -g "${gid}" -m -s /bin/bash "${user}"
 
-# Download and setup activemq version v6.0.1
+# Download and setup activemq version v6.1.3
 RUN set -x && \
     mkdir -p "${ACTIVEMQ_HOME}" \
     && wget -q "${ACTIVEMQ_DOWNLOAD_URL}/${ACTIVEMQ_VERSION}/${ACTIVEMQ_FILE}" -O "${ACTIVEMQ_FILE}" \

docker/activemq/versions.yaml

@@ -16,34 +16,34 @@
 cloudbuild:
   enable_parallel: false
 versions:
-- dir: 6/debian11/6.0
+- dir: 6/debian11/6.1
   from: marketplace.gcr.io/google/c2d-debian11
   packages:
     activemq:
-      version: 6.0.1
+      version: 6.1.3
       major: '6'
   repo: activemq6
   tags:
-  - 6.0.1-debian11
-  - 6.0-debian11
+  - 6.1.3-debian11
+  - 6.1-debian11
   - 6-debian11
-  - 6.0.1
-  - '6.0'
+  - 6.1.3
+  - '6.1'
   - '6'
   - latest
 
 - dir: 5/debian11/5.18
   from: marketplace.gcr.io/google/c2d-debian11
   packages:
     activemq:
-      version: 5.18.3
+      version: 5.18.5
       major: '5'
   repo: activemq5
   tags:
-  - 5.18.3-debian11
+  - 5.18.5-debian11
   - 5.18-debian11
   - 5-debian11
-  - 5.18.3
+  - 5.18.5
   - '5.18'
   - '5'
   - latest

vm/chef/cookbooks/general-purpose-cloud-vm/metadata.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +14,5 @@
 
 name 'general-purpose-cloud-vm'
 depends 'c2d-config'
+depends 'c2d-shared'
 supports 'debian'

vm/chef/cookbooks/general-purpose-cloud-vm/recipes/default.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+include_recipe 'general-purpose-cloud-vm::ospo'
+
 apt_update do
   action :update
 end