mirror of
https://github.com/offen/website.git
synced 2024-12-25 06:10:22 +01:00
normalize naming schemes for docker images
This commit is contained in:
parent
916bcb3fd4
commit
37c55fdcf4
@ -28,12 +28,12 @@ jobs:
|
||||
keys:
|
||||
- v1-{{ .Branch }}
|
||||
paths:
|
||||
- /caches/proxy.tar
|
||||
- /caches/website.tar
|
||||
- run:
|
||||
name: Load Docker image layer cache
|
||||
command: |
|
||||
set +o pipefail
|
||||
docker load -i /caches/proxy.tar | true
|
||||
docker load -i /caches/website.tar | true
|
||||
- run:
|
||||
name: Build application Docker image
|
||||
command: |
|
||||
@ -46,16 +46,16 @@ jobs:
|
||||
export DOCKER_IMAGE_TAG="latest"
|
||||
export ROBOTS_FILE="robots.txt.staging"
|
||||
fi
|
||||
docker build --build-arg siteurl=$SITEURL --build-arg robots=$ROBOTS_FILE -t offen/proxy:$DOCKER_IMAGE_TAG -f build/proxy/Dockerfile .
|
||||
docker build --build-arg siteurl=$SITEURL --build-arg robots=$ROBOTS_FILE -t offen/website:$DOCKER_IMAGE_TAG -f build/Dockerfile .
|
||||
- run:
|
||||
name: Save Docker image layer cache
|
||||
command: |
|
||||
mkdir -p /caches
|
||||
docker save -o /caches/proxy.tar offen/proxy
|
||||
docker save -o /caches/website.tar offen/website
|
||||
- save_cache:
|
||||
key: v1-{{ .Branch }}-{{ epoch }}
|
||||
paths:
|
||||
- /caches/proxy.tar
|
||||
- /caches/website.tar
|
||||
- deploy:
|
||||
name: Push application Docker image
|
||||
command: |
|
||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -18,7 +18,6 @@ __pycache__/
|
||||
|
||||
# Distribution / packaging
|
||||
.Python
|
||||
build/
|
||||
develop-eggs/
|
||||
dist/
|
||||
downloads/
|
||||
|
@ -11,7 +11,7 @@
|
||||
"containerDefinitions": [
|
||||
{
|
||||
"name": "proxy",
|
||||
"image": "offen/proxy:stable",
|
||||
"image": "offen/website:stable",
|
||||
"essential": true,
|
||||
"memory": 128,
|
||||
"portMappings": [
|
||||
|
@ -4,7 +4,7 @@
|
||||
"containerDefinitions": [
|
||||
{
|
||||
"name": "proxy",
|
||||
"image": "offen/proxy:latest",
|
||||
"image": "offen/website:latest",
|
||||
"essential": true,
|
||||
"memory": 128,
|
||||
"portMappings": [
|
||||
|
7
Makefile
7
Makefile
@ -35,10 +35,11 @@ update:
|
||||
@echo "Applying pending database migrations ..."
|
||||
@docker-compose run server migrate
|
||||
|
||||
DOCKER_IMAGE_TAG ?= latest
|
||||
DOCKER_IMAGE_TAG ?= local
|
||||
ROBOTS_FILE ?= robots.txt.staging
|
||||
SITEURL ?= http://localhost:8000
|
||||
|
||||
build:
|
||||
@docker build --build-arg siteurl=${SITEURL} --build-arg robots=${ROBOTS_FILE} -t offen/proxy:${DOCKER_IMAGE_TAG} -f build/proxy/Dockerfile .
|
||||
@docker build --build-arg siteurl=${SITEURL} --build-arg robots=${ROBOTS_FILE} -t offen/website:${DOCKER_IMAGE_TAG} -f build/Dockerfile .
|
||||
|
||||
.PHONY: setup build bootstrap build secret
|
||||
.PHONY: setup build bootstrap build
|
||||
|
Loading…
Reference in New Issue
Block a user