Rename docker files

This commit is contained in:
nicolas.dorier 2018-11-26 11:54:35 +09:00
parent c51692a6b1
commit 221b19216b
4 changed files with 7 additions and 7 deletions

View File

@ -11,10 +11,10 @@ jobs:
command: | command: |
cd docker-compose-generator cd docker-compose-generator
sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS 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 sudo docker push $DOCKERHUB_REPO:latest-amd64
publish_docker_linuxarm: publish_docker_linuxarm32v7:
machine: machine:
docker_layer_caching: true docker_layer_caching: true
steps: steps:
@ -25,7 +25,7 @@ jobs:
# #
cd docker-compose-generator cd docker-compose-generator
sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS 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 sudo docker push $DOCKERHUB_REPO:latest-arm32v7
publish_docker_multiarch: publish_docker_multiarch:
@ -54,14 +54,14 @@ workflows:
filters: filters:
branches: branches:
only: dcg-latest only: dcg-latest
- publish_docker_linuxarm: - publish_docker_linuxarm32v7:
filters: filters:
branches: branches:
only: dcg-latest only: dcg-latest
- publish_docker_multiarch: - publish_docker_multiarch:
requires: requires:
- publish_docker_linuxamd64 - publish_docker_linuxamd64
- publish_docker_linuxarm - publish_docker_linuxarm32v7
filters: filters:
branches: branches:
only: dcg-latest only: dcg-latest

View File

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