diff options
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | deployment/docker/Dockerfile (renamed from Dockerfile) | 0 | ||||
| -rw-r--r-- | deployment/docker/Dockerfile_alma9 (renamed from Dockerfile_alma9) | 0 | ||||
| -rw-r--r-- | deployment/docker/Dockerfile_centos7 (renamed from Dockerfile_centos7) | 0 | ||||
| -rw-r--r-- | deployment/docker/Dockerfile_fedora (renamed from Dockerfile_fedora) | 0 | ||||
| -rw-r--r-- | deployment/docker/Dockerfile_ubuntu (renamed from Dockerfile_ubuntu) | 0 | ||||
| -rw-r--r-- | deployment/gitlab/config.toml (renamed from runner_backup/config.toml) | 0 |
7 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71c383be..cfe2054d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ build_dev_images: - > /kaniko/executor --context $CI_PROJECT_DIR - --dockerfile $CI_PROJECT_DIR/Dockerfile_$IMAGE + --dockerfile $CI_PROJECT_DIR/deployment/docker/Dockerfile_$IMAGE --destination $CI_REGISTRY_IMAGE/$IMAGE:$IMAGE_TAG_LATEST --destination $CI_REGISTRY_IMAGE/$IMAGE:$IMAGE_TAG_SHA --build-arg HELM_VERSION=$HELM_VERSION @@ -183,7 +183,7 @@ build_container_image: - > /kaniko/executor --context $CI_PROJECT_DIR - --dockerfile $CI_PROJECT_DIR/Dockerfile + --dockerfile $CI_PROJECT_DIR/deployment/docker/Dockerfile --destination $CI_REGISTRY_IMAGE/$IMAGE:$IMAGE_TAG_LATEST --destination $CI_REGISTRY_IMAGE/$IMAGE:$IMAGE_TAG_SHA --build-arg HELM_VERSION=$HELM_VERSION @@ -211,7 +211,7 @@ build_container_image_tag: - > /kaniko/executor --context $CI_PROJECT_DIR - --dockerfile $CI_PROJECT_DIR/Dockerfile + --dockerfile $CI_PROJECT_DIR/deployment/docker/Dockerfile --destination $CI_REGISTRY_IMAGE/$IMAGE:$IMAGE_TAG_VER --build-arg HELM_VERSION=$HELM_VERSION --build-arg RANCHER_CLI_VERSION=$RANCHER_CLI_VERSION diff --git a/Dockerfile b/deployment/docker/Dockerfile index 4dd9ab8a..4dd9ab8a 100644 --- a/Dockerfile +++ b/deployment/docker/Dockerfile diff --git a/Dockerfile_alma9 b/deployment/docker/Dockerfile_alma9 index 38df2b30..38df2b30 100644 --- a/Dockerfile_alma9 +++ b/deployment/docker/Dockerfile_alma9 diff --git a/Dockerfile_centos7 b/deployment/docker/Dockerfile_centos7 index 5e591b04..5e591b04 100644 --- a/Dockerfile_centos7 +++ b/deployment/docker/Dockerfile_centos7 diff --git a/Dockerfile_fedora b/deployment/docker/Dockerfile_fedora index 52b9fb03..52b9fb03 100644 --- a/Dockerfile_fedora +++ b/deployment/docker/Dockerfile_fedora diff --git a/Dockerfile_ubuntu b/deployment/docker/Dockerfile_ubuntu index db2eafa3..db2eafa3 100644 --- a/Dockerfile_ubuntu +++ b/deployment/docker/Dockerfile_ubuntu diff --git a/runner_backup/config.toml b/deployment/gitlab/config.toml index 92e1ad3e..92e1ad3e 100644 --- a/runner_backup/config.toml +++ b/deployment/gitlab/config.toml |