Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2024-11-23 12:30:41 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Switch back to single dredd container

Browse Source
This commit is contained in:
Stanislav Simovski 2020-02-09 20:58:32 +02:00
parent 3f940451a3
commit 67c3a912d0
5 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.dredd/dredd.local.yml
View File

@ -1,7 +1,6 @@
dry-run: null
hookfiles: ./.dredd/compiled_hooks
language: go
sandbox: false
#server: context=dev task dc:up
server-wait: 240
init: false
@ -17,9 +16,7 @@ inline-errors: false
details: false
method: []
color: true
level: info
timestamp: false
silent: false
loglevel: debug
path: []
hooks-worker-timeout: 5000
hooks-worker-connect-timeout: 1500
@ -31,4 +28,4 @@ hooks-worker-handler-host: 0.0.0.0
hooks-worker-handler-port: 61321
config: ./.dredd/dredd.yml
blueprint: api-docs.yml
endpoint: 'http://0.0.0.0:3000'
endpoint: 'http://semaphore_ci:3000'

5
.dredd/dredd.yml
View File

@ -1,7 +1,6 @@
dry-run: null
hookfiles: ./.dredd/compiled_hooks
language: go
sandbox: false
#server: context=dev task dc:up
server-wait: 240
init: false
@ -17,9 +16,7 @@ inline-errors: false
details: false
method: []
color: true
level: info
timestamp: false
silent: false
loglevel: debug
path: []
hooks-worker-timeout: 5000
hooks-worker-connect-timeout: 1500

3
deployment/docker/ci/Dockerfile
View File

@ -1,8 +1,5 @@
# Golang testing image with some tools already installed
FROM golang:1.13-alpine
LABEL maintainer="Tom Whiston <tom.whiston@gmail.com>"
ENV SEMAPHORE_VERSION="development" SEMAPHORE_ARCH="linux_amd64" \
SEMAPHORE_CONFIG_PATH="${SEMAPHORE_CONFIG_PATH:-/etc/semaphore}" \
APP_ROOT="/go/src/github.com/ansible-semaphore/semaphore/"

34
deployment/docker/ci/dredd.Dockerfile
View File

@ -1,27 +1,21 @@
FROM golang:1.13-alpine as golang
RUN apk add --no-cache curl git
# We need the source and task to compile the hooks
COPY . /semaphore/
RUN (cd /usr && curl -sL https://taskfile.dev/install.sh | sh)
WORKDIR /semaphore
RUN task deps:tools && task deps:be && task compile:be && task compile:api:hooks
FROM apiaryio/dredd:13.0.0 as dredd
RUN apk add --no-cache bash
COPY --from=golang /semaphore /semaphore
WORKDIR /semaphore
COPY deployment/docker/ci/dredd/entrypoint /usr/local/bin
FROM apiaryio/dredd:13.0.0
ENV SEMAPHORE_SERVICE=semaphore_ci \
SEMAPHORE_PORT=3000 \
MYSQL_SERVICE=mysql \
MYSQL_PORT=3306
RUN apk add --no-cache bash curl git go
RUN (cd /usr && curl -sL https://taskfile.dev/install.sh | sh)
# We need the source and task to compile the hooks
COPY . /semaphore/
WORKDIR /semaphore
RUN task deps:tools && task deps:be && task compile:be && task compile:api:hooks
COPY deployment/docker/ci/dredd/entrypoint /usr/local/bin
ENTRYPOINT ["/usr/local/bin/entrypoint"]

10
deployment/docker/dev/Dockerfile
View File

@ -1,10 +1,10 @@
# Golang testing image with some tools already installed
FROM golang:1.13-alpine
ENV SEMAPHORE_VERSION="development" SEMAPHORE_ARCH="linux_amd64" \
SEMAPHORE_CONFIG_PATH="${SEMAPHORE_CONFIG_PATH:-/etc/semaphore}" \
APP_ROOT="/go/src/github.com/ansible-semaphore/semaphore/"
# hadolint ignore=DL3013
RUN apk add --no-cache git mysql-client python py-pip py-openssl openssl ca-certificates curl curl-dev openssh-client tini nodejs nodejs-npm bash rsync && \
apk --update add --virtual build-dependencies python-dev libffi-dev openssl-dev build-base &&\
rm -rf /var/cache/apk/*
@ -28,9 +28,9 @@ RUN cd $(go env GOPATH) && curl -sL https://taskfile.dev/install.sh | sh
# Copy in app source
WORKDIR ${APP_ROOT}
COPY . ${APP_ROOT}
RUN deployment/docker/dev/bin/install
RUN deployment/docker/ci/bin/install
USER 1000
USER semaphore
EXPOSE 3000
CMD ["task", "watch"]
ENTRYPOINT ["/usr/local/bin/semaphore-wrapper"]
CMD ["./bin/semaphore", "--config", "/etc/semaphore/config.json"]