Skip to content
This repository has been archived by the owner on Aug 12, 2020. It is now read-only.

Commit

Permalink
Fix Dockerfile
Browse files Browse the repository at this point in the history
So not run `sudo bash`, since sudo is not installed
  • Loading branch information
sgillespie committed May 18, 2016
1 parent 036cef4 commit 601f77b
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 32 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y curl
# Add official gitlab repositories to APT
RUN curl \
-L "https://packages.gitlab.com/install/repositories/runner/gitlab-ci-multi-runner/script.deb.sh" \
| sudo bash
| bash

# Install gitlab-runner
RUN apt-get install -y gitlab-ci-multi-runner
Expand Down
65 changes: 34 additions & 31 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,36 @@
gitlab:
image: gitlab/gitlab-ce
container_name: gitlab
hostname: gitlab.example.com
ports:
- "8443:443"
- "8080:80"
- "8022:22"
volumes_from:
- gitlab_data
version: '2'

gitlab_data:
image: alpine
command: /bin/true
container_name: gitlab-data
volumes:
- /etc/gitlab
- /var/log/gitlab
- /var/opt/gitlab
volumes:
gitlab_config:
gitlab_data:
gitlab_logs:

gitlab_runner:
build: .
container_name: gitlab-runner
env_file:
- ./gitlab-runner.env
environment:
CI_SERVER_URL: http://gitlab.example.com:80/ci
DOCKER_IMAGE: alpine
RUNNER_EXECUTOR: docker
links:
- gitlab:gitlab.example.com
volumes:
- /var/run/docker.sock:/var/run/docker.sock
services:
gitlab:
image: gitlab/gitlab-ce:latest
container_name: gitlab
hostname: gitlab
network_mode: bridge
ports:
- "443:443"
- "80:80"
- "9922:22"
volumes:
- gitlab_config:/etc/gitlab
- gitlab_data:/var/opt/gitlab
- gitlab_logs:/var/log/gitlab

gitlab_runner:
build: .
container_name: gitlab-runner
environment:
CI_SERVER_URL: http://gitlab/ci
DOCKER_IMAGE: alpine
REGISTRATION_TOKEN: ${REGISTRATION_TOKEN}
RUNNER_EXECUTOR: docker
RUNNER_TAG_LIST: docker
network_mode: bridge
links:
- gitlab:gitlab
volumes:
- /var/run/docker.sock:/var/run/docker.sock

0 comments on commit 601f77b

Please sign in to comment.