Skip to content
Snippets Groups Projects
Commit dfa1a71e authored by Erick Hitter's avatar Erick Hitter
Browse files

Merge branch 'develop' into 'master'

Don't bother with container registry, need to build for specific architectures

See merge request !3
parents 9ba96c95 5f5f12be
Branches
No related tags found
Loading
Checking pipeline status
...@@ -3,9 +3,6 @@ image: docker:latest ...@@ -3,9 +3,6 @@ image: docker:latest
services: services:
- docker:dind - docker:dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
# #
# TESTS # TESTS
# #
...@@ -35,7 +32,6 @@ build:master: ...@@ -35,7 +32,6 @@ build:master:
stage: deploy stage: deploy
script: script:
- docker build --pull -t "$CI_REGISTRY_IMAGE:latest" ./context/ - docker build --pull -t "$CI_REGISTRY_IMAGE:latest" ./context/
- docker push "$CI_REGISTRY_IMAGE:latest"
only: only:
- master - master
when: manual when: manual
...@@ -44,6 +40,5 @@ build:dev: ...@@ -44,6 +40,5 @@ build:dev:
stage: deploy stage: deploy
script: script:
- docker build --pull -t "$CI_REGISTRY_IMAGE:dev" ./context/ - docker build --pull -t "$CI_REGISTRY_IMAGE:dev" ./context/
- docker push "$CI_REGISTRY_IMAGE:dev"
except: except:
- master - master
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment