Skip to content

Commit

Permalink
Merge branch 'fix-service-names' into 'master'
Browse files Browse the repository at this point in the history
Fix service names

See merge request ix.ai/swarm-launcher!22
  • Loading branch information
tlex committed Dec 10, 2020
2 parents d77486f + 56afc6a commit 30ff786
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
variables:
DOCKERHUB_REPO_NAME: swarm-launcher
ENABLE_ARM64: 'true'
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LABEL maintainer="[email protected]"\
RUN apk add --no-cache bash curl jq

# add entrypoint.sh launcher script
ADD entrypoint.sh /
COPY entrypoint.sh /

# run the image
ENTRYPOINT /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ The image uses `docker-compose` to start a new project (see `LAUNCH_PROJECT_NAME

Either way, `swarm-launcher` takes care of the setup, tear-down and cleanup of the project.

## Supported architectures

The following architectures are supported by this image:

* `linux/amd64`
* `linux/arm64`
* `linux/arm/v7`
* `linux/arm/v6`

## Docs and Usage examples

See [Docs](docs/) and [Usage Examples](docs/usage_examples)
Expand Down
4 changes: 2 additions & 2 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ if [ "${CREATE_COMPOSE_FILE}" == "true" ]; then
fi

cat <<xEOF > ${COMPOSE_FILE}
version: "3.7"
version: "3.8"
services:
${LAUNCH_SERVICE_NAME}:
"${LAUNCH_SERVICE_NAME}":
image: "${LAUNCH_IMAGE}"
restart: "no"
labels:
Expand Down

0 comments on commit 30ff786

Please sign in to comment.