From 917319396c69df5fb52657a0940a991a4afbbd52 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 27 Jul 2019 12:56:00 +0100 Subject: [PATCH 1/6] Adding docker compose --- docker-compose.yml | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..5b83e0f --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,57 @@ +version: '3' +services: + 12_1_0_2: + build: 12.1.0.2/Dockerfile + image: utplsqlv3/lukasztest:12c-r1-se2 + ports: + - 1521:1521 + - 5500:5500 + + 12_1_0_2_small: + build: 12.1.0.2-small/Dockerfile + image: utplsqlv3/lukasztest:12c-r1-se2-small + ports: + - 1521:1521 + - 5500:5500 + + 12_2_0_1: + build: 12.2.0.1/Dockerfile + image: utplsqlv3/lukasztest:12c-r2-se2 + ports: + - 1521:1521 + - 5500:5500 + + 12_2_0_1_small: + build: 12.2.0.1-small/Dockerfile + image: utplsqlv3/lukasztest:12c-r2-se2-small + ports: + - 1521:1521 + - 5500:5500 + + 18_3: + build: 18.3/Dockerfile + image: utplsqlv3/lukasztest:18c-se2 + ports: + - 1521:1521 + - 5500:5500 + + 18_3_small: + build: 18.3-small/Dockerfile + image: utplsqlv3/lukasztest:18c-se2-small + ports: + - 1521:1521 + - 5500:5500 + + 19_3: + build: 19.3/Dockerfile + image: utplsqlv3/lukasztest:19c-se2 + ports: + - 1521:1521 + - 5500:5500 + + 19_3_small: + build: 19.3-small/Dockerfile + image: utplsqlv3/lukasztest:19c-se2-small + ports: + - 1521:1521 + - 5500:5500 \ No newline at end of file From d370d7f9ae12a084d479065b48f534e0838ba20e Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 27 Jul 2019 12:58:23 +0100 Subject: [PATCH 2/6] Adding azure piplines template --- azure-pipelines.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..aa91291 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,19 @@ +# Starter pipeline +# Start with a minimal pipeline that you can customize to build and deploy your code. +# Add steps that build, run tests, deploy, and more: +# https://aka.ms/yaml + +trigger: +- master + +pool: + vmImage: 'ubuntu-latest' + +steps: +- script: echo Hello, world! + displayName: 'Run a one-line script' + +- script: | + echo Add other tasks to build, test, and deploy your project. + echo See https://aka.ms/yaml + displayName: 'Run a multi-line script' From 59c37f4cf86fc4a1cddfac38dd95ebc696ca20a2 Mon Sep 17 00:00:00 2001 From: Lukasz Date: Sat, 27 Jul 2019 15:26:36 +0100 Subject: [PATCH 3/6] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index aa91291..aefb5c0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,10 +10,9 @@ pool: vmImage: 'ubuntu-latest' steps: -- script: echo Hello, world! - displayName: 'Run a one-line script' - -- script: | - echo Add other tasks to build, test, and deploy your project. - echo See https://aka.ms/yaml - displayName: 'Run a multi-line script' +- task: DockerCompose@0 + inputs: + containerregistrytype: 'Container Registry' + dockerRegistryEndpoint: 'utPLSQL-docker' + dockerComposeFile: '**/docker-compose.yml' + action: 'Build services' From 6b1a8b3462fa42a19da0f31b170283a701c86728 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 27 Jul 2019 15:29:13 +0100 Subject: [PATCH 4/6] Quote service name. Run only one for tests --- docker-compose.yml | 51 +--------------------------------------------- 1 file changed, 1 insertion(+), 50 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5b83e0f..a0ed467 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,57 +1,8 @@ version: '3' services: - 12_1_0_2: + '12_1_0_2': build: 12.1.0.2/Dockerfile image: utplsqlv3/lukasztest:12c-r1-se2 ports: - 1521:1521 - 5500:5500 - - 12_1_0_2_small: - build: 12.1.0.2-small/Dockerfile - image: utplsqlv3/lukasztest:12c-r1-se2-small - ports: - - 1521:1521 - - 5500:5500 - - 12_2_0_1: - build: 12.2.0.1/Dockerfile - image: utplsqlv3/lukasztest:12c-r2-se2 - ports: - - 1521:1521 - - 5500:5500 - - 12_2_0_1_small: - build: 12.2.0.1-small/Dockerfile - image: utplsqlv3/lukasztest:12c-r2-se2-small - ports: - - 1521:1521 - - 5500:5500 - - 18_3: - build: 18.3/Dockerfile - image: utplsqlv3/lukasztest:18c-se2 - ports: - - 1521:1521 - - 5500:5500 - - 18_3_small: - build: 18.3-small/Dockerfile - image: utplsqlv3/lukasztest:18c-se2-small - ports: - - 1521:1521 - - 5500:5500 - - 19_3: - build: 19.3/Dockerfile - image: utplsqlv3/lukasztest:19c-se2 - ports: - - 1521:1521 - - 5500:5500 - - 19_3_small: - build: 19.3-small/Dockerfile - image: utplsqlv3/lukasztest:19c-se2-small - ports: - - 1521:1521 - - 5500:5500 \ No newline at end of file From 391dc657068ea1db889cec28f59601795a0ae5d0 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 27 Jul 2019 15:34:17 +0100 Subject: [PATCH 5/6] Update version Update dockerfile dir --- docker-compose.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a0ed467..919a2dd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,8 @@ -version: '3' +version: '3.3' + services: - '12_1_0_2': - build: 12.1.0.2/Dockerfile + 12_1_0_2: + build: ./12.1.0.2 image: utplsqlv3/lukasztest:12c-r1-se2 ports: - 1521:1521 From c5548f1cb5d0163e3fba4d31965db687e5573053 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 27 Jul 2019 15:39:30 +0100 Subject: [PATCH 6/6] Modify compose file --- docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 919a2dd..1ce07fd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,9 @@ version: '3.3' services: - 12_1_0_2: - build: ./12.1.0.2 - image: utplsqlv3/lukasztest:12c-r1-se2 + oracle12102: + build: "./12.1.0.2" + image: "utplsqlv3/lukasztest:12c-r1-se2" ports: - - 1521:1521 - - 5500:5500 + - "1521:1521" + - "5500:5500"