Merge pull request #572 from TomChv/docker-compose

Add Docker compose package
This commit is contained in:
Andrea Luzzardi
2021-06-25 19:35:32 +02:00
committed by GitHub
16 changed files with 460 additions and 4 deletions

View File

@@ -62,6 +62,19 @@ import (
[string]: true | false | string @dagger(input)
}
// Image registries
registries: [...{
target?: string
username: string
secret: dagger.#Secret
}] @dagger(input)
// Copy contents from other artifacts
copy: [string]: from: dagger.#Artifact
// Write file in the container
files: [string]: string
// Setup docker client and then execute the user command
#code: #"""
# Setup ssh
@@ -103,7 +116,8 @@ import (
#up: [
op.#Load & {
from: alpine.#Image & {
package: {
"package": {
package
bash: true
"openssh-client": true
"docker-cli": true
@@ -111,6 +125,34 @@ import (
}
},
for registry in registries {
op.#Exec & {
args: ["/bin/bash", "-c", #"""
echo "$TARGER_HOST" | docker login --username "$DOCKER_USERNAME" --password-stdin "$(cat /password)"
"""#,
]
env: {
TARGET_HOST: registry.target
DOCKER_USERNAME: registry.username
}
mount: "/password": secret: registry.password
}
},
for dest, content in files {
op.#WriteFile & {
"content": content
"dest": dest
}
},
for dest, src in copy {
op.#Copy & {
from: src.from
"dest": dest
}
},
if ssh.keyPassphrase != _|_ {
op.#WriteFile & {
content: #"""
@@ -137,7 +179,7 @@ import (
op.#Exec & {
always: true
args: [
"/bin/sh",
"/bin/bash",
"--noprofile",
"--norc",
"-eo",
@@ -146,7 +188,6 @@ import (
]
"env": {
env
if ssh != _|_ {
DOCKER_HOSTNAME: ssh.host
DOCKER_USERNAME: ssh.user
@@ -161,6 +202,9 @@ import (
}
}
"mount": {
if ssh == _|_ {
"/var/run/docker.sock": from: "docker.sock"
}
if ssh != _|_ {
if ssh.key != _|_ {
"/key": secret: ssh.key

View File

@@ -0,0 +1,16 @@
package compose
import (
"alpha.dagger.io/alpine"
)
// A container image to run the docker-compose client
#Client: alpine.#Image & {
package: {
bash: true
jq: true
curl: true
"openssh-client": true
"docker-compose": true
}
}

View File

@@ -0,0 +1,82 @@
// Docker-compose operations
package compose
import (
"strconv"
"alpha.dagger.io/dagger"
"alpha.dagger.io/docker"
)
#App: {
ssh?: {
// ssh host
host: string @dagger(input)
// ssh user
user: string @dagger(input)
// ssh port
port: *22 | int @dagger(input)
// private key
key: dagger.#Secret @dagger(input)
// fingerprint
fingerprint?: string @dagger(input)
// ssh key passphrase
keyPassphrase?: dagger.#Secret @dagger(input)
}
// Accept either a contaxt, a docker-compose or both together
source?: dagger.#Artifact @dagger(input)
composeFile?: string @dagger(input)
// Image registries
registries: [...{
target?: string
username: string
secret: dagger.#Secret
}] @dagger(input)
#code: #"""
if [ -n "$DOCKER_HOSTNAME" ]; then
ssh -i /key -fNT -o "StreamLocalBindUnlink=yes" -L "$(pwd)"/docker.sock:/var/run/docker.sock -p "$DOCKER_PORT" "$DOCKER_USERNAME"@"$DOCKER_HOSTNAME"
export DOCKER_HOST="unix://$(pwd)/docker.sock"
fi
# Extend session duration
echo "Host *\nServerAliveInterval 240" >> "$HOME"/.ssh/config
chmod 600 "$HOME"/.ssh/config
# Move compose
if [ -d "$SOURCE_DIR" ]; then
if [ -f docker-compose.yaml ]; then
cp docker-compose.yaml "$SOURCE_DIR"/docker-compose.yaml
fi
cd "$SOURCE_DIR"
fi
docker-compose build
docker-compose up -d
"""#
run: docker.#Command & {
"ssh": ssh
command: #code
package: "docker-compose": true
"registries": registries
if source != _|_ {
copy: "/source": from: source
}
if composeFile != _|_ {
files: "/docker-compose.yaml": composeFile
}
env: {
COMPOSE_HTTP_TIMEOUT: strconv.FormatInt(200, 10)
if source != _|_ {
SOURCE_DIR: "source"
}
}
}
}

View File

@@ -0,0 +1,89 @@
package compose
import (
"strconv"
"alpha.dagger.io/dagger"
"alpha.dagger.io/dagger/op"
)
#CleanupCompose: {
// docker-compose up context
context: dagger.#Artifact
ssh: {
// ssh host
host: string @dagger(input)
// ssh user
user: string @dagger(input)
// ssh port
port: *22 | int @dagger(input)
// private key
key: dagger.#Secret @dagger(input)
// fingerprint
fingerprint?: string @dagger(input)
// ssh key passphrase
keyPassphrase?: dagger.#Secret @dagger(input)
}
#code: #"""
# Export host
export DOCKER_HOST="unix://$(pwd)/docker.sock"
# Start ssh agent
eval $(ssh-agent) > /dev/null
ssh-add /key > /dev/null
ssh -i /key -o "StreamLocalBindUnlink=yes" -fNT -L "$(pwd)"/docker.sock:/var/run/docker.sock -p "$DOCKER_PORT" "$DOCKER_USERNAME"@"$DOCKER_HOSTNAME" || true
# Down
if [ -d /source ]; then
cd /source
fi
docker-compose down -v
"""#
#up: [
op.#Load & {from: context},
op.#WriteFile & {
content: #code
dest: "/entrypoint.sh"
},
op.#Exec & {
always: true
args: [
"/bin/sh",
"--noprofile",
"--norc",
"-eo",
"pipefail",
"/entrypoint.sh",
]
env: {
DOCKER_HOSTNAME: ssh.host
DOCKER_USERNAME: ssh.user
DOCKER_PORT: strconv.FormatInt(ssh.port, 10)
if ssh.keyPassphrase != _|_ {
SSH_ASKPASS: "/get_passphrase"
DISPLAY: "1"
}
}
mount: {
if ssh.key != _|_ {
"/key": secret: ssh.key
}
if ssh.keyPassphrase != _|_ {
"/passphrase": secret: ssh.keyPassphrase
}
}
},
]
}

View File

@@ -0,0 +1,75 @@
package compose
import (
"alpha.dagger.io/dagger"
"alpha.dagger.io/docker"
)
repo: dagger.#Artifact @dagger(input)
TestSSH: {
key: dagger.#Secret @dagger(input)
host: string @dagger(input)
user: string @dagger(input)
}
TestCompose: {
up: #App & {
ssh: {
key: TestSSH.key
host: TestSSH.host
user: TestSSH.user
}
source: repo
}
verify: docker.#Command & {
ssh: up.run.ssh
command: #"""
docker container ls | grep "api" | grep "Up"
"""#
}
cleanup: #CleanupCompose & {
context: up.run
ssh: verify.ssh
}
}
TestInlineCompose: {
up: #App & {
ssh: {
key: TestSSH.key
host: TestSSH.host
user: TestSSH.user
}
source: repo
composeFile: #"""
version: "3"
services:
api-mix:
build: .
environment:
PORT: 7000
ports:
- 7000:7000
networks:
default:
name: mix-context
"""#
}
verify: docker.#Command & {
ssh: up.run.ssh
command: #"""
docker container ls | grep "api-mix" | grep "Up"
"""#
}
cleanup: #CleanupCompose & {
context: up.run
ssh: verify.ssh
}
}

View File

@@ -0,0 +1,15 @@
FROM node:12-alpine
WORKDIR /app
COPY package.json package.json
RUN npm install
COPY . .
ENV PORT=8080
EXPOSE 8080
CMD ["npm", "start"]

View File

@@ -0,0 +1,7 @@
version: "3"
services:
api:
build: ""
ports:
- "8080:8080"

View File

@@ -0,0 +1,13 @@
import express from "express";
import { get } from "env-var";
const app = express();
const port: number = get('PORT').required().asPortNumber();
app.get('/ping', (req, res) => {
res.status(200).send('pong')
});
app.listen(port, '0.0.0.0', () => console.log("Server listen on http://localhost:" + port));

View File

@@ -0,0 +1,22 @@
{
"name": "test",
"version": "1.0.0",
"description": "A simple api",
"main": "index.ts",
"scripts": {
"build": "tsc",
"start": "ts-node index.ts",
"test": "test"
},
"author": "Tom Chauveau",
"license": "ISC",
"devDependencies": {
"ts-node": "^8.9.1",
"typescript": "^3.8.3"
},
"dependencies": {
"@types/express": "^4.17.6",
"env-var": "^6.1.1",
"express": "^4.17.1"
}
}

View File

@@ -0,0 +1,12 @@
{
"compilerOptions": {
"sourceMap": true,
"outDir": "dist",
"strict": true,
"lib": [
"esnext",
"dom"
],
"esModuleInterop": true
}
}