diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f59381f0dbbb362f81f96f679b2f0c5ebdb4cf8..c62ca7b27052ac24d0a616a94bdffdfe1447a572 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,11 +5,11 @@ # services: # - docker:dind # script: -# - docker build ubuntu-18.04 +# - docker build . # except: # - tags -.build_image: +build_image: image: docker:git tags: - docker @@ -17,15 +17,11 @@ - docker:dind script: - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY - - docker build --pull -t "$CI_REGISTRY_IMAGE/$PLATFORM:$CI_BUILD_TAG" $PLATFORM + - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" $PLATFORM - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY - - docker push "$CI_REGISTRY_IMAGE/$PLATFORM:$CI_BUILD_TAG" - - docker tag "$CI_REGISTRY_IMAGE/$PLATFORM:$CI_BUILD_TAG" "$CI_REGISTRY_IMAGE/$PLATFORM:latest" - - docker push "$CI_REGISTRY_IMAGE/$PLATFORM:latest" + - docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" + - docker tag "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" "$CI_REGISTRY_IMAGE:latest" + - docker push "$CI_REGISTRY_IMAGE:latest" only: - tags -build_ubuntu-18.04: - extends: .build_image - variables: - PLATFORM: "ubuntu-18.04" diff --git a/ubuntu-18.04/Dockerfile b/Dockerfile similarity index 100% rename from ubuntu-18.04/Dockerfile rename to Dockerfile diff --git a/ubuntu-18.04/startx.sh b/startx.sh similarity index 100% rename from ubuntu-18.04/startx.sh rename to startx.sh