1
0
mirror of https://github.com/vwxyzjn/portwarden synced 2025-12-06 01:33:18 +00:00

Master # Use the latest images

This commit is contained in:
Costa Huang
2018-12-15 22:56:16 -05:00
parent 04e96cd9d0
commit f83b3ce29a
4 changed files with 32 additions and 33 deletions

View File

@@ -1,29 +1,28 @@
# New syntax
---
kind: pipeline
name: production
steps:
- name: docker
image: docker:18.06.1-ce-dind
privileged: true
environment:
Salt:
from_secret: Salt
DOCKER_HOST:
unix:///var/run/host.sock
docker_username:
from_secret: docker_username
docker_password:
from_secret: docker_password
commands:
- docker login -u $docker_username -p $docker_password
- apk add git
- git fetch --tags
- git describe --always
- sh ./docker-build.sh
volumes:
- name: cache
path: /var/run/host.sock
- name: build-docker-images
image: docker:18.06.1-ce-dind
privileged: true
environment:
Salt:
from_secret: Salt
DOCKER_HOST:
unix:///var/run/host.sock
docker_username:
from_secret: docker_username
docker_password:
from_secret: docker_password
commands:
- docker login -u $docker_username -p $docker_password
- apk add git
- git fetch --tags\
- sh ./docker-build.sh
volumes:
- name: docker-sock
path: /var/run/host.sock
volumes:
- name: cache
host:
path: /var/run/docker.sock
- name: docker-sock
host:
path: /var/run/docker.sock

View File

@@ -3,7 +3,7 @@ version: '3'
services:
salt_generator:
image: vwxyzjn/portwarden-server-dev:1.7.0
image: vwxyzjn/portwarden-server-dev:v0.1.1
environment:
- Salt=${Salt}
volumes:
@@ -12,7 +12,7 @@ services:
go run ./utils/generate_salt_file.go
scheduler:
image: vwxyzjn/portwarden-server-dev:1.7.0
image: vwxyzjn/portwarden-server-dev:v0.1.1
stdin_open: true
tty: true
environment:
@@ -33,7 +33,7 @@ services:
- 6379:6379
worker:
image: vwxyzjn/portwarden-server-dev:1.7.0
image: vwxyzjn/portwarden-server-dev:v0.1.1
stdin_open: true
tty: true
environment:
@@ -58,7 +58,7 @@ services:
- "8081:8081"
frontend:
image: vwxyzjn/portwarden-frontend:1.2.0
image: vwxyzjn/portwarden-frontend:v0.1.1
restart: always
ports:
- "8000:8000"

View File

@@ -53,7 +53,7 @@ services:
kompose.service.type: "loadbalancer"
frontend:
image: vwxyzjn/portwarden-frontend:1.2.0
image: vwxyzjn/portwarden-frontend:v0.1.1
restart: always
ports:
- "8000:8000"

View File

@@ -3,7 +3,7 @@ version: '3'
services:
scheduler:
image: vwxyzjn/portwarden-server-prod:1.7.3
image: vwxyzjn/portwarden-server-prod:v0.1.1
stdin_open: true
tty: true
environment:
@@ -25,7 +25,7 @@ services:
image: redis
worker:
image: vwxyzjn/portwarden-server-prod:1.7.3
image: vwxyzjn/portwarden-server-prod:v0.1.1
stdin_open: true
tty: true
environment:
@@ -53,7 +53,7 @@ services:
kompose.service.type: "loadbalancer"
frontend:
image: vwxyzjn/portwarden-frontend:1.2.0
image: vwxyzjn/portwarden-frontend:v0.1.1
restart: always
ports:
- "8000:8000"