From 8f8ee6ad778ea2aaa591d1d0c48f0fd200b2d274 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Fri, 11 Aug 2017 20:45:13 -0400 Subject: [PATCH] feat: added docker entrypoint --- .build/docker_init.sh | 4 +++ wercker.yml | 57 ++++++++++++++++++++----------------------- 2 files changed, 30 insertions(+), 31 deletions(-) create mode 100644 .build/docker_init.sh diff --git a/.build/docker_init.sh b/.build/docker_init.sh new file mode 100644 index 00000000..b9727f3a --- /dev/null +++ b/.build/docker_init.sh @@ -0,0 +1,4 @@ +#!/bin/ash +apk add bash curl git openssh +cd /var/www +node server diff --git a/wercker.yml b/wercker.yml index 26ef3f86..4846a546 100644 --- a/wercker.yml +++ b/wercker.yml @@ -23,45 +23,18 @@ build: - script: name: copy artifacts code: | - ls - cp -LR assets node_modules server config.sample.yml package.json wiki.cmd wiki.js "$WERCKER_OUTPUT_DIR" - -deploy-github: - box: node:8 - steps: - - script: - name: package - code: | - tar -chzfv wiki-js.tar.gz * -X .build/.deployexclude - tar -chzfv node_modules.tar.gz node_modules - SEMVER_LAST=`npm show wiki.js version` - chmod +x ./.build/semver_next.sh - SEMVER_NEXT=`./.build/semver_next.sh -p $SEMVER_LAST` - - github-create-release: - token: $GITHUB_TOKEN - tag: "v${SEMVER_NEXT}" - prerelease: true - - github-upload-asset: - token: $GITHUB_TOKEN - file: wiki-js.tar.gz - - github-upload-asset: - token: $GITHUB_TOKEN - file: node_modules.tar.gz + cp -LR assets node_modules server config.sample.yml package.json wiki.cmd wiki.js "$WERCKER_OUTPUT_DIR/var/wiki" + cp .build/docker_init.sh "$WERCKER_OUTPUT_DIR/init.sh" deploy-docker-master: box: node:8-alpine steps: - - script: - name: install dependencies - code: | - apk update - apk add bash curl git openssh - internal/docker-push: username: $DOCKER_HUB_USERNAME password: $DOCKER_HUB_PASSWORD tag: latest, master ports: "3000" - entrypoint: node server + entrypoint: ["ash", "/init.sh"] repository: requarks/wiki registry: https://registry.hub.docker.com @@ -73,6 +46,28 @@ deploy-docker-dev: password: $DOCKER_HUB_PASSWORD tag: dev ports: "3000" - entrypoint: node server + entrypoint: ["ash", "/init.sh"] repository: requarks/wiki registry: https://registry.hub.docker.com + +deploy-github: + box: node:8 + steps: + - script: + name: package + code: | + tar -chzfv wiki-js.tar.gz * -X .build/.deployexclude + tar -chzfv node_modules.tar.gz node_modules + SEMVER_LAST=`npm show wiki.js version` + chmod +x ./.build/semver_next.sh + SEMVER_NEXT=`./.build/semver_next.sh -p $SEMVER_LAST` + - github-create-release: + token: $GITHUB_TOKEN + tag: "v${SEMVER_NEXT}" + prerelease: true + - github-upload-asset: + token: $GITHUB_TOKEN + file: wiki-js.tar.gz + - github-upload-asset: + token: $GITHUB_TOKEN + file: node_modules.tar.gz