Bug fix: Remove non-functional "Use custom workspace" field from Freestyle project configuration form (jenkinsci#1429)

* Remove first instance of 'Use custom workspace' field for freestyle projects

* Update docker-compose.yml and README.md

* Fix broken docs links

* Add the necessary shm_size info in docker-compose.yml

* Update src/docker/docker-compose.yml

Author: krisstern

README.md

@@ -34,8 +34,8 @@
   - [Cancel pending builds on merge request update](#cancel-pending-builds-on-merge-request-update)
 - [Compatibility](#compatibility)
 - [Contributing to the Plugin](#contributing-to-the-plugin)
-- [Testing With Docker](#testing-with-docker)
-- [Release Workflow](#release-workflow)
+- [Testing With Docker](src/docker/README.md#quick-test-environment-setup-using-docker-for-linuxamd64)
+- [Release Workflow](CONTRIBUTING.md#release-workflow)
 - [Changelog](#changelog)
 
 ## Introduction

src/docker/README.md

@@ -9,41 +9,35 @@ If they don't already exist, create the following directories and make sure the
 * /srv/docker/gitlab/gitlab
 * /srv/docker/gitlab/redis
 * /srv/docker/jenkins
-To start the containers for Linux, run `docker-compose up -d` from the `docker` folder. If you have problems accessing the services in the containers, run `docker-compose up` by itself to see output from the services as they start, and the latter command is the verbose version of the former.
+To start the containers for Linux, run `docker-compose up -d` from the `src/docker` folder. If you have problems accessing the services in the containers, run `docker-compose up` by itself to see output from the services as they start, and the latter command is the verbose version of the former.
 
 ## Quick test environment setup using Docker for MacOS/arm64
 
-You need to modify the example docker-compose file available at `gitlab-plugin/src/docker` to set up instances of the latest `GitLab` and `Jenkins` versions for MacOS/arm64. 
+You need to modify the example docker-compose file available at `src/docker` to set up instances of the latest `GitLab` and `Jenkins` versions for MacOS/arm64. 
 
 Due to Apple's System Integrity Protection (SIP), the suggested paths cannot be simply created and accessed, so you may need to use the home directory (~) as a root for the new directories to be created.
 
 In the `docker-compose.yml` file:
+
 1. Change the ports to 
     - '55580:80'
     - '55522:22'
-    - '55443:443'
 as the browser may block the ports in original docker-compose file.
 2. Change the gitlab volumes to 
     `/Users/yourusername/srv/docker/gitlab/config:/etc/gitlab`
     `/Users/yourusername/srv/docker/gitlab/logs:/var/log/gitlab`
     `/Users/yourusername/srv/docker/gitlab/data:/var/opt/gitlab`
 3. Change the jenkins volumes to 
     `/Users/yourusername/srv/docker/jenkins:/var/jenkins_home`
-4. In your Docker-Desktop go to `Settings > General > Choose file sharing implementation for your containers` and switch to osxfs (Legacy). As `osxfs (Legacy)` utilizes more resources of the system, make sure the assigned resources are sufficient by going to `Settings > Resources` and make suitable adjustments where necessary, otherwise Docker Desktop may go on start mode forever on restarting.
-5. Add `shm_size: '5gb'`under gitlab services.
+4. In your Docker-Desktop go to `Settings > General > Choose file sharing implementation for your containers` and switch to `osxfs (Legacy)`. As `osxfs (Legacy)` utilizes more resources of the system, make sure the assigned resources are sufficient by going to `Settings > Resources` and make suitable adjustments where necessary, otherwise Docker Desktop may go on start mode forever on restarting.
 
 Like the instructions for Linux, for macOS users to start the containers, run `docker-compose up -d` from the `docker` folder. If you have any problems accessing the services in the containers, run `docker-compose up` by itself to see output from the services as they start.
 
 ## Access GitLab
 
-To access `GitLab`, you first need to create a user - `root` with some password. To do so, follow the following steps :
-1. In the GitLab containers terminal inside Docker Desktop, type `gitlab-rails console` and wait for at least a few minutes for the console to start.
-2. Once the console is started successfully, run the following commands in sequence at the console, noting that there are certain security rules to the password choice:
-    a. `user = User.new(username: 'root', email: '[email protected]', name: 'root', password: 'setyourown', password_confirmation: 'setyourown')`
-        b. `user.skip_confirmation!` 
-    c. `user.save!`
-3. Now, point your browser to `http://localhost:55580` and log in with `root` as the username and `setyourown` as the password. Then create a user for Jenkins, impersonate that user, get its API key, set up test repos, etc. When creating webhooks to trigger Jenkins jobs, use `http://jenkins:8080` as the base URL.
-
+To access `GitLab`, you first need to create a user - `root` with some password. To do so, follow the following steps:
+1. Point your browser to `http://localhost:55580` and log in with `root` as the username and `p@ssw0rd` as the password. 
+2. Then create a user for Jenkins, impersonate that user, get its API key, set up test repos, etc. When creating webhooks to trigger Jenkins jobs, use `http://jenkins:8080` as the base URL.
 
 If you have trouble cloning a GitLab repository, it may be because you have a leftover host key from an SSH connection to a previous installation of GitLab in Docker. To troubleshoot, run `ssh -vT git@localhost -p 55522`.
 

src/docker/docker-compose.yml

@@ -5,10 +5,10 @@ services:
     image: 'gitlab/gitlab-ce:latest'
     restart: "no"
     hostname: 'localhost'
+    platform: 'linux/amd64'
     ports:
       - '55580:80'
       - '55522:22'
-      - '55443:443'
     volumes:
       - '/srv/docker/gitlab/config:/etc/gitlab'
       - '/srv/docker/gitlab/logs:/var/log/gitlab'
@@ -17,7 +17,7 @@ services:
       GITLAB_OMNIBUS_CONFIG: |
         external_url 'http://localhost'
         gitlab_rails['gitlab_shell_ssh_port'] = 55522
-        gitlab_rails['initial_root_password'] = 'password'
+        gitlab_rails['initial_root_password'] = 'p@ssw0rd'
     shm_size: '5gb'
 
   jenkins:
@@ -27,4 +27,5 @@ services:
       - "8080:8080"
       - "50000:50000"
     volumes:
-      - /srv/docker/jenkins:/var/jenkins_home
+      - '/srv/docker/jenkins:/var/jenkins_home'
+    shm_size: '5gb'

src/main/resources/com/dabsquared/gitlabjenkins/connection/GitLabConnectionProperty/config.jelly

@@ -1,7 +1,6 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form"
 	xmlns:c="/lib/credentials" xmlns:st="jelly:stapler">
-	<st:include page="configure-advanced.jelly" optional="true" />
 	<f:entry title="${%GitLab Connection}" field="gitLabConnection">
 		<f:select />
 	</f:entry>