From 35361cb1dbdf50b870329f359fe2d865d20feb55 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 13 Feb 2017 12:03:51 +0100
Subject: [PATCH 1/7] Add test checkpoints
---
.gitlab-ci.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1fca411..770e757 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,7 @@ test:install:
image: $TEST_IMAGE
stage: test
script:
+ - apt-get install net-tools
- source /home/gdk/.bash_profile
- cd gem
- gem build gitlab-development-kit.gemspec
@@ -36,8 +37,13 @@ test:install:
- cd /home/gdk
- gdk init
- cd gitlab-development-kit
+ - netstat -lpt
- gdk install
+ - netstat -lpt
+ - sleep 10
+ - netstat -lpt
- support/set-gitlab-upstream
+ - netstat -lpt
- gdk run &
- sleep 10
- curl -f http://127.0.0.1:3000/
--
GitLab
From 41a0253a4ea59f316bc6683008c0bdc49f810993 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 13 Feb 2017 12:28:32 +0100
Subject: [PATCH 2/7] Improve creating an user in GDK Dockerfile
---
.gitlab-ci.yml | 2 +-
Dockerfile | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 770e757..bec201b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ test:install:
image: $TEST_IMAGE
stage: test
script:
- - apt-get install net-tools
+ - apt-get -y install net-tools
- source /home/gdk/.bash_profile
- cd gem
- gem build gitlab-development-kit.gemspec
diff --git a/Dockerfile b/Dockerfile
index e512c75..f6b944d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,11 +21,13 @@ RUN apt-get install -y git postgresql postgresql-contrib libpq-dev redis-server
libicu-dev cmake g++ nodejs libkrb5-dev golang ed pkg-config libsqlite3-dev \
libreadline-dev npm sudo nodejs-legacy
-# Install rbenv
-
-RUN adduser --disabled-password --gecos "" gdk
+# Add GDK user
+RUN useradd --user-group --groups sudo --create-home gdk
USER gdk
+
+# Install rbenv
+
RUN git clone https://github.com/sstephenson/rbenv.git /home/gdk/.rbenv
RUN echo 'export PATH="/home/gdk/.rbenv/bin:$PATH"' >> /home/gdk/.bash_profile
RUN echo 'eval "$(rbenv init -)"' >> /home/gdk/.bash_profile
--
GitLab
From 8d3ed12003f290a2dd503bfc8d3643503ab4317f Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 13 Feb 2017 13:41:14 +0100
Subject: [PATCH 3/7] Install net-tools in Docker image using sudo
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bec201b..701e5c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ test:install:
image: $TEST_IMAGE
stage: test
script:
- - apt-get -y install net-tools
+ - sudo apt-get -y install net-tools
- source /home/gdk/.bash_profile
- cd gem
- gem build gitlab-development-kit.gemspec
--
GitLab
From f689efe693330ad74330d60419a0f5d981a81126 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 15 Feb 2017 14:34:59 +0100
Subject: [PATCH 4/7] Install net-tools in GDK Dockerfile
---
Dockerfile | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index f6b944d..8c3b2e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,13 +21,16 @@ RUN apt-get install -y git postgresql postgresql-contrib libpq-dev redis-server
libicu-dev cmake g++ nodejs libkrb5-dev golang ed pkg-config libsqlite3-dev \
libreadline-dev npm sudo nodejs-legacy
+
+# GDK tools
+RUN apt-get install -u net-tools
+
# Add GDK user
+RUN useradd --user-group --create-home gdk
-RUN useradd --user-group --groups sudo --create-home gdk
USER gdk
# Install rbenv
-
RUN git clone https://github.com/sstephenson/rbenv.git /home/gdk/.rbenv
RUN echo 'export PATH="/home/gdk/.rbenv/bin:$PATH"' >> /home/gdk/.bash_profile
RUN echo 'eval "$(rbenv init -)"' >> /home/gdk/.bash_profile
--
GitLab
From d7e9c9f08aeed499d08f274d978bff08a4c0f15a Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 15 Feb 2017 14:40:49 +0100
Subject: [PATCH 5/7] Do not install net-tools in .gitlab-ci.yml
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 701e5c2..013bce5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,6 @@ test:install:
image: $TEST_IMAGE
stage: test
script:
- - sudo apt-get -y install net-tools
- source /home/gdk/.bash_profile
- cd gem
- gem build gitlab-development-kit.gemspec
--
GitLab
From cae919f9373ce1c2f030a87a54f31f6892dc3435 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 15 Feb 2017 16:33:31 +0100
Subject: [PATCH 6/7] Kill node in case it is running before gdk run
---
.gitlab-ci.yml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 013bce5..71699c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,11 +38,8 @@ test:install:
- cd gitlab-development-kit
- netstat -lpt
- gdk install
- - netstat -lpt
- - sleep 10
- - netstat -lpt
- support/set-gitlab-upstream
- - netstat -lpt
+ - killall node
- gdk run &
- sleep 10
- curl -f http://127.0.0.1:3000/
--
GitLab
From 7ba1bbfce97500b621bff9cb2b837d32f7ee2f3f Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 16 Feb 2017 10:41:53 +0100
Subject: [PATCH 7/7] Install psmisc in GDK Dockerfile
---
Dockerfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 8c3b2e7..e710c3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,9 +21,8 @@ RUN apt-get install -y git postgresql postgresql-contrib libpq-dev redis-server
libicu-dev cmake g++ nodejs libkrb5-dev golang ed pkg-config libsqlite3-dev \
libreadline-dev npm sudo nodejs-legacy
-
# GDK tools
-RUN apt-get install -u net-tools
+RUN apt-get install -y net-tools psmisc
# Add GDK user
RUN useradd --user-group --create-home gdk
--
GitLab