From dce37cd726f255e67fe4ad2194a42ef87a7c4927 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Thu, 14 Jul 2016 23:05:39 -0700 Subject: [PATCH] etc: update for new Jenkins setup --- .gitmodules | 3 --- etc/build_deploy.sh | 9 ------- etc/common/devops-helpers | 1 - etc/docker/.gitignore | 1 + etc/docker/Dockerfile | 6 +++++ etc/docker/build.sh | 5 ---- etc/docker/push.sh | 5 ---- etc/kubernetes/deploy_rc.sh | 8 ------ etc/kubernetes/stackage-server-prod-rc.yaml | 26 -------------------- etc/kubernetes/stackage-server-prod-svc.yaml | 19 -------------- etc/scripts/stage_docker.sh | 6 +++++ stack.yaml | 7 ------ 12 files changed, 13 insertions(+), 83 deletions(-) delete mode 100644 .gitmodules delete mode 100755 etc/build_deploy.sh delete mode 160000 etc/common/devops-helpers create mode 100644 etc/docker/.gitignore create mode 100644 etc/docker/Dockerfile delete mode 100755 etc/docker/build.sh delete mode 100755 etc/docker/push.sh delete mode 100755 etc/kubernetes/deploy_rc.sh delete mode 100644 etc/kubernetes/stackage-server-prod-rc.yaml delete mode 100644 etc/kubernetes/stackage-server-prod-svc.yaml create mode 100755 etc/scripts/stage_docker.sh diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e788dab..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "etc/common/devops-helpers"] - path = etc/common/devops-helpers - url = https://github.com/fpco/devops-helpers.git diff --git a/etc/build_deploy.sh b/etc/build_deploy.sh deleted file mode 100755 index 506771f..0000000 --- a/etc/build_deploy.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -# See description at https://github.com/fpco/devops-helpers#wrappers -set -xe -cd "$(dirname "${BASH_SOURCE[0]}")/.." -ENV="$1"; shift -stack --docker --docker-auto-pull test "$@" -etc/docker/build.sh --docker --no-build "$@" -etc/docker/push.sh "$ENV" -etc/kubernetes/deploy_rc.sh "$ENV" diff --git a/etc/common/devops-helpers b/etc/common/devops-helpers deleted file mode 160000 index 0625e1a..0000000 --- a/etc/common/devops-helpers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0625e1af76d2b64a428bf2b0b9d8d6a857cf8a6a diff --git a/etc/docker/.gitignore b/etc/docker/.gitignore new file mode 100644 index 0000000..742d8e4 --- /dev/null +++ b/etc/docker/.gitignore @@ -0,0 +1 @@ +/_artifacts/ diff --git a/etc/docker/Dockerfile b/etc/docker/Dockerfile new file mode 100644 index 0000000..bc8c947 --- /dev/null +++ b/etc/docker/Dockerfile @@ -0,0 +1,6 @@ +#fpco/stack-run:lts-5 +FROM fpco/stack-run@sha256:4b170ac899755a89c0295b7726c5530015211055125f6e3f6c5b902cb3e9b74b +COPY _artifacts/config/ /app/config/ +COPY _artifacts/static/ /app/static/ +COPY _artifacts/stackage-server /usr/local/bin/stackage-server +COPY _artifacts/stackage-server-cron /usr/local/bin/stackage-server-cron diff --git a/etc/docker/build.sh b/etc/docker/build.sh deleted file mode 100755 index e057422..0000000 --- a/etc/docker/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# See description at https://github.com/fpco/devops-helpers#wrappers -set -xe -cd "$(dirname "${BASH_SOURCE[0]}")/../.." -stack image container "$@" diff --git a/etc/docker/push.sh b/etc/docker/push.sh deleted file mode 100755 index 8893c23..0000000 --- a/etc/docker/push.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# See description at https://github.com/fpco/devops-helpers#wrappers -set -xe -exec "$(dirname "${BASH_SOURCE[0]}")/../common/devops-helpers/docker/push_helper.sh" \ - --repo fpco/stackage-server "$@" diff --git a/etc/kubernetes/deploy_rc.sh b/etc/kubernetes/deploy_rc.sh deleted file mode 100755 index 5c6e927..0000000 --- a/etc/kubernetes/deploy_rc.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -# See description at https://github.com/fpco/devops-helpers#wrappers -set -xe -exec "$(dirname ${BASH_SOURCE[0]})/../common/devops-helpers/kubernetes/deploy_rc_helper.sh" \ - --app "stackage-server" \ - --repo fpco/stackage-server \ - --specdir "$(dirname "${BASH_SOURCE[0]}")" \ - "$@" diff --git a/etc/kubernetes/stackage-server-prod-rc.yaml b/etc/kubernetes/stackage-server-prod-rc.yaml deleted file mode 100644 index 8ee1ff4..0000000 --- a/etc/kubernetes/stackage-server-prod-rc.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# Kubernetes ---- -apiVersion: v1 -kind: ReplicationController -metadata: - name: stackage-server-prod-v0 -spec: - replicas: 2 - template: - metadata: - labels: - app: stackage-server-prod - version: v0 - spec: - containers: - - name: stackage-server - image: fpco/stackage-server:prod - imagePullPolicy: Always - ports: - - name: http - containerPort: 3000 - command: ["stackage-server"] - workingDir: /app - env: - - name: APPROOT - value: "https://www.stackage.org" diff --git a/etc/kubernetes/stackage-server-prod-svc.yaml b/etc/kubernetes/stackage-server-prod-svc.yaml deleted file mode 100644 index 4fd8890..0000000 --- a/etc/kubernetes/stackage-server-prod-svc.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Kubernetes ---- -apiVersion: v1 -kind: Service -metadata: - name: stackage-server-prod - labels: - app: stackage-server-prod -spec: - ports: - - name: http - port: 80 - targetPort: http - - name: https - port: 443 - targetPort: http - type: ClusterIP - selector: - app: stackage-server-prod diff --git a/etc/scripts/stage_docker.sh b/etc/scripts/stage_docker.sh new file mode 100755 index 0000000..b938544 --- /dev/null +++ b/etc/scripts/stage_docker.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -e +cd "$(dirname "${BASH_SOURCE[0]}")/../.." +mkdir -p etc/docker/_artifacts +stack install --local-bin-path=etc/docker/_artifacts "$@" +cp -r config static etc/docker/_artifacts/ diff --git a/stack.yaml b/stack.yaml index a195429..1ad53fb 100644 --- a/stack.yaml +++ b/stack.yaml @@ -5,13 +5,6 @@ packages: git: https://github.com/snoyberg/hoogle.git commit: 765bd653d687e8569cd989be1637de86dcb20d56 extra-dep: true -image: - container: - name: fpco/stackage-server - base: fpco/stack-run:lts-5 - add: - config: /app/config - static: /app/static extra-deps: - prometheus-client-0.1.0.1 - prometheus-metrics-ghc-0.1.0.1