Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions .gitpod.yml

This file was deleted.

24 changes: 0 additions & 24 deletions .gitpod/Dockerfile

This file was deleted.

23 changes: 0 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@

This repository includes the files necessary for transitioning from `docker` to `docker compose` in our Jenkins tutorials and installation guides.

### How to Set Up the Repository in Gitpod?

- To initialize your Gitpod workspace, prepend `gitpod.io/#` to any GitHub, GitLab, or Bitbucket repository URL.
- Access our Gitpod workspace [here](https://gitpod.io/#https://github.com/jenkins-docs/quickstart-tutorials).
- If you plan to use Gitpod regularly, we recommend installing the Gitpod extension. This extension adds a Gitpod button to every GitHub repository you visit, making it easy to launch a workspace. You can find the extension [here](https://chrome.google.com/webstore/detail/gitpod-online-ide/dodmmooeoklaejobgleioelladacbeki) for Chromium and [here](https://addons.mozilla.org/firefox/addon/gitpod/) for Firefox.

## Gitpod

Gitpod is a cloud-based development environment designed for teams. It supports various IDEs, including VScode, IntelliJ, and many more, enabling efficient and secure software development.

### Steps to Run Examples from the Repository

- Use `docker compose up` to run examples from this project. Currently, we have four working examples:
Expand All @@ -35,26 +25,13 @@ Gitpod is a cloud-based development environment designed for teams. It supports

- Check the status of the container with the `docker ps` or `docker compose ps` commands.
- Access your running Jenkins instance at [http://127.0.0.1:8080](http://127.0.0.1:8080).
- On Gitpod, if containers are running successfully after entering `docker compose --profile <tutorial-name> up`, a pop-up titled `A service is available on port 8080` should appear. If it doesn't, you can view the running service in the `PORTS` section on the right side of the terminal.

### Clean Up Instructions

- To stop and remove running containers, use `docker compose --profile <tutorial-name> down`.
- If you encounter a `Resource is still in use` warning, use the `--remove-orphans` option which would give `docker compose --profile <tutorial-name> down --remove-orphans`.
- To remove the created volumes (should you need to restart from scratch), add the `-v` option which would give `docker compose --profile <tutorial-name> down -v`.

### Suppressing Jenkins Warning using JCASC

To improve the Gitpod experience with Jenkins, we've suppressed a reverse proxy setup warning in Jenkins that was causing issues in the Gitpod environment. We achieved this using Jenkins Configuration as Code ([JCASC](https://www.jenkins.io/projects/jcasc/)) and added the following property to the JCASC YAML file:

```yaml
jenkins:
disabledAdministrativeMonitors:
- "hudson.diagnosis.ReverseProxySetupMonitor"
```

For more detailed information about this configuration and the context behind it, please refer to the [corresponding issue](https://github.com/ash-sxn/GSoC-2023-docker-based-quickstart/issues/61).

### Encountering Issues?

If you encounter any issues while running the examples, please open an issue [in this repository](https://github.com/jenkins-docs/quickstart-tutorials/issues/new/choose).
Expand Down
8 changes: 0 additions & 8 deletions build-docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ services:
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
node:
build: dockerfiles/node/.
environment:
- GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
container_name: desktop-jenkins_agent-1-node
profiles:
- node
Expand All @@ -139,8 +137,6 @@ services:
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
multi:
build: dockerfiles/multi/.
environment:
- GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
container_name: desktop-jenkins_agent-1-multi
profiles:
- multi
Expand All @@ -162,8 +158,6 @@ services:
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
android:
build: dockerfiles/android/.
environment:
- GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
container_name: desktop-jenkins_agent-1-android
profiles:
- android
Expand All @@ -185,8 +179,6 @@ services:
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
golang:
build: dockerfiles/golang/.
environment:
- GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
container_name: desktop-jenkins_agent-1-golang
profiles:
- golang
Expand Down
8 changes: 0 additions & 8 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,6 @@ services:
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
node:
image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:node_agent_${BRANCH_SUFFIX}
environment:
- GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
container_name: desktop-jenkins_agent-1-node
profiles:
- node
Expand All @@ -198,8 +196,6 @@ services:
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
android:
image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:android_agent_${BRANCH_SUFFIX}
environment:
- GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
container_name: desktop-jenkins_agent-1-android
profiles:
- android
Expand Down Expand Up @@ -239,8 +235,6 @@ services:
retries: 5
multi:
image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:node_agent_${BRANCH_SUFFIX}
environment:
- GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
container_name: desktop-jenkins_agent-1-multi
profiles:
- multi
Expand All @@ -262,8 +256,6 @@ services:
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
golang:
image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:golang_${BRANCH_SUFFIX}
environment:
- GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
container_name: desktop-jenkins_agent-1-golang
profiles:
- golang
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This Dockerfile is used to create a Jenkins server with a specific version and pre-configured settings.

# We start by defining an ARG for the Jenkins version. This allows us to easily change the version of Jenkins we want to use.
ARG JENKINS_VERSION=2.452.3
ARG JENKINS_VERSION=2.447

# We then use the official Jenkins image with the specified version as our base image.
FROM jenkins/jenkins:"${JENKINS_VERSION}"
Expand Down
37 changes: 0 additions & 37 deletions dockerfiles/gitpodURL.sh

This file was deleted.

44 changes: 0 additions & 44 deletions updatecli/updatecli.d/gitpod.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: Bump Jenkins' LTS version in the controller Dockerfile
name: Bump Jenkins' Weekly version in the controller Dockerfile

scms:
default:
Expand All @@ -14,35 +14,35 @@ scms:
branch: "{{ .github.branch }}"

sources:
JenkinsLatestLTS:
name: Get the latest Jenkins LTS version
kind: shell
JenkinsLatestWeekly:
name: Get the latest Jenkins Weekly version
kind: jenkins
spec:
command: bash ./updatecli/scripts/jenkins-lts.sh 0 # source input value passed as argument
release: weekly

conditions:
# Test that the latest LTS Jenkins version exists
jenkinsLatestLTSVersion:
# Test that the latest Weekly Jenkins version exists
jenkinsLatestWeeklyVersion:
kind: jenkins
sourceid: JenkinsLatestLTS
sourceid: JenkinsLatestWeekly

targets:
setJenkinsLatestLTS:
setJenkinsLatestWeekly:
kind: dockerfile
spec:
file: dockerfiles/Dockerfile
instruction:
keyword: "ARG"
matcher: "JENKINS_VERSION"
name: "[jenkins-controller] Bump Jenkins LTS version in dockerfiles/Dockerfile"
sourceid: JenkinsLatestLTS
name: "[jenkins-controller] Bump Jenkins Weekly version in dockerfiles/Dockerfile"
sourceid: JenkinsLatestWeekly
scmid: default

actions:
default:
kind: github/pullrequest
scmid: default
title: Update Jenkins LTS versions to {{ source "JenkinsLatestLTS" }} in the controller Dockerfile
title: Update Jenkins Weekly versions to {{ source "JenkinsLatestWeekly" }} in the controller Dockerfile
spec:
labels:
- dependencies
Expand Down