Merge pull request #11 from posit-dev/bakery-single-config

Move Workbench images over to `bakery.yaml`

Author: bschwedler

.github/CODEOWNERS

@@ -1,3 +1,2 @@
 # format per https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#about-code-owners
-* @bschwedler @ianpittwood
-
+* @bschwedler @ianpittwood @zachhannum

.github/workflows/build-test-push.yml

@@ -43,6 +43,12 @@ jobs:
       - name: Setup just
         uses: extractions/setup-just@v2
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: "posit"
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -58,7 +64,10 @@ jobs:
           bakery build --load
 
       - name: Test images
-        run: bakery run dgoss
+        run: |
+          GOSS_PATH=${GITHUB_WORKSPACE}/tools/goss \
+          DGOSS_PATH=${GITHUB_WORKSPACE}/tools/dgoss \
+          bakery run dgoss
 
       - name: Push images
         env:

CODE_OF_CONDUCT.md

@@ -0,0 +1,134 @@
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official email address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[INSERT CONTACT METHOD].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
+

README.md

@@ -1,3 +1,19 @@
-# proto-posit-images-workbench
+# Posit Workbench Container Images
 
-Prototype repository for new Posit Workbench images.
+Container images for [Posit Workbench](https://docs.posit.co/ide/server-pro).
+
+## Getting Started
+
+### Prerequisites
+
+### Installation
+
+## Usage
+
+## Issues
+
+If you encounter any issues or have any questions, please [open an issue](https://github.com/posit-dev/images-workbench/issues). We appreciate your feedback.
+
+## Code of Conduct
+
+We expect all contributors to adhere to the project's [Code of Conduct](CODE_OF_CONDUCT.md) and create a positive and inclusive community.

bakery.yaml

@@ -0,0 +1,73 @@
+#######################################################################################################################
+# BAKERY REPOSITORY CONFIG
+#
+# This file is used to define global properties for builds inside a repo managed by Posit's Bakery tool.
+#######################################################################################################################
+
+# Define properties of the local repository. This information will be used when labeling image builds.
+repository:
+  url: "github.com/posit-dev/images-workbench"
+  vendor: "Posit Software, PBC"
+  maintainer: "Posit Docker Team <docker@posit.co>"
+  authors:
+    - name: Ian H. Pittwood
+      email: ian.pittwood@posit.co
+    - name: Ben Schwedler
+      email: ben@posit.co
+
+# Define image registries used by builds in this repository. Images will be tagged appropriately for each registry.
+# Logins for private registries should be managed independently of Bakery.
+registries:
+  - host: "docker.io"
+    namespace: "posit"
+  - host: "ghcr.io"
+    namespace: "posit-dev"
+
+images:
+  - name: workbench
+    displayName: "Posit Workbench"
+    description: "A containerized image of Posit Workbench (PWB). Posit Workbench
+      delivers RStudio, Jupyter, VS Code, and the new Positron IDE all in one place.
+      It gives data teams the IDEs they love, and IT the control and governance needed
+      for secure, compliant work."
+    documentationUrl: "https://docs.posit.co/ide/server-pro/"
+    variants:
+      - name: Standard
+        extension: std
+        tagDisplayName: std
+        primary: true
+        options:
+          - tool: goss
+            wait: 15
+            command: "/usr/bin/supervisord -c /etc/supervisor/supervisord.conf"
+      - name: Minimal
+        extension: min
+        tagDisplayName: min
+    versions:
+      - name: 2025.05.1+513.pro3
+        subpath: '2025.05'
+        latest: true
+        os:
+          - name: Ubuntu 22.04
+            primary: true
+      - name: 2024.12.1+563.pro5
+        subpath: '2024.12'
+        os:
+          - name: Ubuntu 22.04
+            primary: true
+  - name: workbench-session-init
+    displayName: "Posit Workbench Session Init"
+    description: "A containerized image for initializing Posit Workbench sessions."
+    documentationUrl: "https://docs.posit.co/ide/server-pro/"
+    versions:
+      - name: 2025.05.1+513.pro3
+        subpath: '2025.05'
+        latest: true
+        os:
+          - name: Ubuntu 22.04
+            primary: true
+      - name: 2024.12.1+563.pro5
+        subpath: '2024.12'
+        os:
+          - name: Ubuntu 22.04
+            primary: true

config.toml

@@ -33,11 +33,11 @@ RUN mkdir -p /pwb-staging && \
 WORKDIR /workspace
 
 # Copy the Go source code and download dependencies
-COPY workbench-session-init/2024.12.1+563.pro5/entrypoint/go.mod workbench-session-init/2024.12.1+563.pro5/entrypoint/go.sum ./
+COPY workbench-session-init/2024.12/entrypoint/go.mod workbench-session-init/2024.12/entrypoint/go.sum ./
 RUN go mod download
 
 # Copy the Go source code and build the binary
-COPY workbench-session-init/2024.12.1+563.pro5/entrypoint/main.go .
+COPY workbench-session-init/2024.12/entrypoint/main.go .
 RUN CGO_ENABLED=0 GOOS=linux go build -ldflags '-s -w' -o entrypoint main.go
 
 # Create the final image