Browse Source

Rename docker files

feature/auto_ssh
nicolas.dorier 6 years ago
parent
commit
221b19216b
  1. 10
      .circleci/config.yml
  2. 4
      docker-compose-generator/docker-compose-generator.sln
  3. 0
      docker-compose-generator/linuxamd64.Dockerfile
  4. 0
      docker-compose-generator/linuxarm32v7.Dockerfile

10
.circleci/config.yml

@ -11,10 +11,10 @@ jobs:
command: |
cd docker-compose-generator
sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
sudo docker build --pull -t $DOCKERHUB_REPO:latest-amd64 -f Dockerfile.linuxamd64 .
sudo docker build --pull -t $DOCKERHUB_REPO:latest-amd64 -f linuxamd64.Dockerfile .
sudo docker push $DOCKERHUB_REPO:latest-amd64
publish_docker_linuxarm:
publish_docker_linuxarm32v7:
machine:
docker_layer_caching: true
steps:
@ -25,7 +25,7 @@ jobs:
#
cd docker-compose-generator
sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
sudo docker build --pull -t $DOCKERHUB_REPO:latest-arm32v7 -f Dockerfile.linuxarm32v7 .
sudo docker build --pull -t $DOCKERHUB_REPO:latest-arm32v7 -f linuxarm32v7.Dockerfile .
sudo docker push $DOCKERHUB_REPO:latest-arm32v7
publish_docker_multiarch:
@ -54,14 +54,14 @@ workflows:
filters:
branches:
only: dcg-latest
- publish_docker_linuxarm:
- publish_docker_linuxarm32v7:
filters:
branches:
only: dcg-latest
- publish_docker_multiarch:
requires:
- publish_docker_linuxamd64
- publish_docker_linuxarm
- publish_docker_linuxarm32v7
filters:
branches:
only: dcg-latest

4
docker-compose-generator/docker-compose-generator.sln

@ -8,8 +8,8 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{8C1C711D-DEF1-474C-A9F6-AAE142412528}"
ProjectSection(SolutionItems) = preProject
..\.circleci\config.yml = ..\.circleci\config.yml
Dockerfile.linuxamd64 = Dockerfile.linuxamd64
Dockerfile.linuxarm32v7 = Dockerfile.linuxarm32v7
linuxamd64.Dockerfile = linuxamd64.Dockerfile
linuxarm32v7.Dockerfile = linuxarm32v7.Dockerfile
EndProjectSection
EndProject
Global

0
docker-compose-generator/Dockerfile.linuxamd64 → docker-compose-generator/linuxamd64.Dockerfile

0
docker-compose-generator/Dockerfile.linuxarm32v7 → docker-compose-generator/linuxarm32v7.Dockerfile

Loading…
Cancel
Save