General updates related to packaging

- Docs were updated
- minor adjustments to Dockerfiles
- helm chart updated to point to actual image registry

README.md

@@ -1,14 +1,18 @@
 # vmpooler-deployment
 
-This repo contains Dockerfiles and a Helm chart that can be used to deploy [VMPooler](https://github.com/puppetlabs/vmpooler).
+This repo contains Dockerfiles and a Helm chart that can be used to deploy [VMPooler](https://github.com/puppetlabs/vmpooler). The DIO team at Puppet uses the code here as part of operating our VMPooler instances.
 
-## Status
+## Docker Registry
 
-This repo is a work in progress. It mostly works but many bits need adjusting here and there as they were compiled from other locations. More details will be added soon.
+The GitHub Actions in this repository publish images to GitHub Packages. You can browse the VMPooler containers [here](https://github.com/puppetlabs/vmpooler-deployment/pkgs/container/vmpooler-deployment%2Fvmpooler).
+
+Containers are organized using image tags:
+
+- `x.y.z-prod-all-providers` represents images built using the Dockerfile in `docker/prod-all-providers`. These images use the Gemfile in the same directory to pull in current versions of the `vmpooler` gem and the gems for all known production-grade providers.
 
 ## Helm Repository
 
-The `docs/` folder in this repository represents a Helm repo served via GitHub Pages at https://puppetlabs.github.io/vmpooler-deployment/
+The `docs/` folder in this repository represents a Helm repository served via GitHub Pages at https://puppetlabs.github.io/vmpooler-deployment/
 
 ```bash
 $ helm repo add vmpooler-deployment https://puppetlabs.github.io/vmpooler-deployment/
@@ -24,3 +28,11 @@ helm repo index --url https://puppetlabs.github.io/vmpooler-deployment/ .
 git add .
 git commit -a
 ```
+
+## Contributing
+
+We welcome and encourage contributions!
+
+## License
+
+vmpooler-deployment is distributed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). See the [LICENSE](LICENSE) file for more details.

docker/dev/Dockerfile

@@ -10,6 +10,7 @@
 
 FROM jruby:9.2-jdk
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENV RACK_ENV=production
 
 RUN apt-get update -qq && \

docker/prod-all-providers/Dockerfile

@@ -10,10 +10,11 @@
 
 FROM jruby:9.2-jdk
 
-ENV RACK_ENV=production
+LABEL org.opencontainers.image.description "VMPooler plus all known providers"
 
-ENV LOGFILE=/dev/stdout \
+ENV DEBIAN_FRONTEND=noninteractive
-      RACK_ENV=production
+ENV LOGFILE=/dev/stdout
+ENV RACK_ENV=production
 
 RUN apt-get update -qq && \
     apt-get upgrade -y && \

docker/test-all-providers/Dockerfile

@@ -10,10 +10,11 @@
 
 FROM jruby:9.2-jdk
 
-ENV RACK_ENV=production
+LABEL org.opencontainers.image.description "VMPooler and known providers pulled directly from Git"
 
-ENV LOGFILE=/dev/stdout \
+ENV DEBIAN_FRONTEND=noninteractive
-      RACK_ENV=production
+ENV LOGFILE=/dev/stdout
+ENV RACK_ENV=production
 
 RUN apt-get update -qq && \
     apt-get upgrade -y && \

docs/index.yaml

@@ -1,9 +1,24 @@
 apiVersion: v1
 entries:
   vmpooler:
+  - apiVersion: v2
+    appVersion: 1.0.0-prod-all-providers
+    created: "2021-12-09T11:59:49.029819707-05:00"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 10.7.12
+    description: A Helm chart to deploy vmpooler
+    digest: c46bf6b2ec36f788dcf254ebe6d864ade8905ca4985425165c65c0191d5e82d7
+    icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
+    name: vmpooler
+    type: application
+    urls:
+    - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.7.0.tgz
+    version: 1.7.0
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2021-12-06T11:28:00.968332324-05:00"
+    created: "2021-12-09T11:59:49.022301197-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -18,7 +33,7 @@ entries:
     version: 1.6.3
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2021-12-06T11:28:00.965217743-05:00"
+    created: "2021-12-09T11:59:49.009848522-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -33,7 +48,7 @@ entries:
     version: 1.6.2
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2021-12-06T11:28:00.962099-05:00"
+    created: "2021-12-09T11:59:49.001801711-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -48,7 +63,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2021-12-06T11:28:00.958844366-05:00"
+    created: "2021-12-09T11:59:48.99054428-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -61,4 +76,4 @@ entries:
     urls:
     - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
     version: 1.6.0
-generated: "2021-12-06T11:28:00.955978849-05:00"
+generated: "2021-12-09T11:59:48.97218007-05:00"

helm-charts/vmpooler/Chart.yaml

@@ -3,8 +3,8 @@ name: vmpooler
 description: A Helm chart to deploy vmpooler
 type: application
 icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
-version: 1.6.3
+version: 1.7.0
-appVersion: 1.3.0
+appVersion: 1.0.0-prod-all-providers
 dependencies:
   - name: redis
     repository: https://charts.bitnami.com/bitnami

helm-charts/vmpooler/values.yaml

@@ -3,8 +3,8 @@
 vmpoolerInstance: 'test-instance'
 
 image:
-  repository: vmpooler
+  repository: ghcr.io/puppetlabs/vmpooler-deployment/vmpooler
-  pullPolicy: Always
+  pullPolicy: IfNotPresent
 
 configmapName: 'vmpooler-baseconfig'
 sut_domain: 'vmpooler.example.com'