Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Ledger GW Development",
"image": "dbcawa/docker_app_dev:ledger_dev_latest",
"image": "dbcawa/docker_app_dev:ledger_dev_django5_latest",
"remoteUser": "container",
"workspaceFolder": "/data/data/projects/ledger",
"mounts": ["type=bind,source=/data/,target=/data/",
Expand All @@ -12,4 +12,4 @@
],
"forwardPorts": [9021,9022,9023,9024,9025,9026,9027,9028,9029,9030],
"initializeCommand" : "${localEnv:HOME}/docker-scripts-dev/windows_vbox/postgres_docker_load.sh"
}
}
10 changes: 5 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
# https://docs.microsoft.com/azure/devops/pipelines/languages/docker

trigger:
- master
- django_5_upgrade

resources:
- repo: self

variables:
tag: '$(Build.BuildId)'
tagDate: $[ format('{0:yyyy}.{0:MM}.{0:dd}.{0:HH}.{0:mm}{0:ss}', pipeline.startTime) ]
isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')]
isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/django_5_upgrade')]

stages:
- stage: Build
Expand All @@ -29,7 +29,7 @@ stages:
command: buildAndPush
dockerfile: '$(Build.SourcesDirectory)/Dockerfile'
tags: |
latest
django5_latest
$(tagDate)
containerRegistry: DockerHub
repository: dbcawa/ledgergw
Expand All @@ -39,7 +39,7 @@ stages:
command: buildAndPush
dockerfile: '$(Build.SourcesDirectory)/dockerdev/Dockerfile'
tags: |
ledger_dev_latest
ledger_dev_$(tagDate)
ledger_dev_django5_latest
ledger_dev_django5_$(tagDate)
containerRegistry: DockerHub
repository: dbcawa/docker_app_dev
2 changes: 1 addition & 1 deletion dockerdev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Prepare the base environment.
FROM dbcawa/ledgergw:latest as builder_base_ledgergwdev
FROM dbcawa/ledgergw:django5_latest as builder_base_ledgergwdev
USER root

RUN apt-get update
Expand Down
Loading