diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 46abc28..7e18a34 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -2,6 +2,7 @@ include: - project: 'developerdurp/yml' ref: 'main' file: - - 'pipelines/gitlab_generic_packages.yml' + - 'pipeline.yml' + #- 'pipelines/gitlab_generic_packages.yml' #- 'pipelines/docker-build-generic.yml' - local: .variables.yml diff --git a/.variables.yml b/.variables.yml index 501f87f..e3d1cbd 100644 --- a/.variables.yml +++ b/.variables.yml @@ -1,3 +1,4 @@ variables: + PIPELINE: 'gitlab' PROJECT_NAME: TERRAFORM.GITLAB.PROJECTS - OCTO_PROJECT_NAME: "Gitlab Projects" \ No newline at end of file + OCTO_PROJECT_NAME: "Gitlab Projects" diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index fd90cf2..0000000 --- a/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM ubuntu:22.04 - -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - curl \ - unzip \ - apt-transport-https \ - software-properties-common && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN curl https://releases.hashicorp.com/terraform/1.6.4/terraform_1.6.4_linux_amd64.zip -o tf.zip -RUN unzip -d /usr/local/bin/ tf.zip && rm tf.zip