From b37180ee2872fc8713205e1b86ed920d9716daa6 Mon Sep 17 00:00:00 2001 From: Lee Brown Date: Sat, 13 Jul 2019 22:14:03 -0800 Subject: [PATCH] fix gitlab yaml --- .gitlab-ci.yml | 4 ++-- README.md | 16 +++++++++++++--- tools/devops/main.go | 1 + 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16dffe7..298acd0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,8 +12,8 @@ variables: # PROJECT_NAME: example-project before_script: - - 'cd ./tools/truss && make install' - - 'cd ./tools/schema && make install' + - 'cd ./tools/truss && make install && cd ../../' + - 'cd ./tools/schema && make install && cd ../../' stages: - build:dev diff --git a/README.md b/README.md index 787aab6..1ecfda2 100644 --- a/README.md +++ b/README.md @@ -493,13 +493,23 @@ instance will be a dedicated host since we need it always up and running, thus i Description: Gitlab runners for running CICD. Rules: Type | Protocol | Port Range | Source | Description - Custom TCP | TCP | 2376 | Anywhere | Gitlab runner for Docker Machine to communicate with Docker daemon. SSH | TCP | 22 | My IP | SSH access for setup. - ``` + ``` 7. Review and Launch instance. Select an existing key pair or create a new one. This will be used to SSH into the instance for additional configuration. +8. Update the security group to reference itself. The instances need to be able to communicate between each other. + + Navigate to edit the security group and add the following two rules where `SECURITY_GROUP_ID` is replaced with the + name of the security group created in step 6. + ``` + Rules: + Type | Protocol | Port Range | Source | Description + Custom TCP | TCP | 2376 | SECURITY_GROUP_ID | Gitlab runner for Docker Machine to communicate with Docker daemon. + SSH | TCP | 22 | SECURITY_GROUP_ID | SSH access for setup. + ``` + 8. SSH into the newly created instance. ```bash @@ -522,7 +532,7 @@ instance will be a dedicated host since we need it always up and running, thus i ```bash base=https://github.com/docker/machine/releases/download/v0.16.0 && curl -L $base/docker-machine-$(uname -s)-$(uname -m) >/tmp/docker-machine && - sudo install /tmp/docker-machine /usr/local/bin/docker-machine + sudo install /tmp/docker-machine /usr/sbin/docker-machine ``` 12. [Register the runner](https://docs.gitlab.com/runner/register/index.html). diff --git a/tools/devops/main.go b/tools/devops/main.go index 549eeda..5ceb933 100644 --- a/tools/devops/main.go +++ b/tools/devops/main.go @@ -34,6 +34,7 @@ func main() { log.Printf("main : Started : Application Initializing version %q", build) defer log.Println("main : Completed") + log.Printf("main : Args: %s", strings.Join(os.Args, " ")) // ========================================================================= // Start Truss