Skip to content
This repository was archived by the owner on May 9, 2024. It is now read-only.

Commit c707f5c

Browse files
committed
delete duplicate code
1 parent 202fabd commit c707f5c

File tree

8 files changed

+45
-123
lines changed

8 files changed

+45
-123
lines changed

actions/create-dummy-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13
1+
FROM golang:1.14
22

33
LABEL "name"="Create Dummy Image"
44
LABEL "version"="1.0"
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: 'Partner Marketplace-ready Image'
2+
description: 'From a partner custom image creates a OCI image that is ready to be submitted to Marketplace'
3+
inputs:
4+
base-image:
5+
description: 'This is the OCID of the custom image that serves as a baseline.'
6+
required: true
7+
default: 'ocid1.image.oc1.iad.aaaaaaaavxqdkuyamlnrdo3q7qa7q3tsd6vnyrxjy3nmdbpv7fs7um53zh5q'
8+
outputs:
9+
image-ocid:
10+
description: 'The OCID of the output image'
11+
runs:
12+
using: 'docker'
13+
image: 'Dockerfile'
14+
args:
15+
- ${{ inputs.base-image }}

actions/create-dummy-image/entrypoint.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ apt-get update
33
apt install -y jq unzip
44

55
# Installing Packer
6-
export VER="1.4.4"
7-
wget -q https://releases.hashicorp.com/packer/${VER}/packer_${VER}_linux_amd64.zip
8-
unzip packer_${VER}_linux_amd64.zip -d /usr/bin
6+
wget -q https://releases.hashicorp.com/packer/1.4.4/packer_1.4.4_linux_amd64.zip
7+
unzip packer_1.4.4_linux_amd64.zip -d /usr/bin
98

109
# Set up environment
1110
echo "${TF_VAR_private_key}" > ${GITHUB_WORKSPACE}/oci.pem
Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,32 @@
11
{
22
"variables": {},
3-
"builders": [
4-
{
5-
"user_ocid": "user_ocid_placeholder",
6-
"tenancy_ocid": "tenancy_ocid_placeholder",
7-
"fingerprint": "fingerprint_placeholder",
8-
"key_file": "key_file_placeholder",
9-
"compartment_ocid": "compartment_ocid_placeholder",
10-
"availability_domain": "IYfK:US-ASHBURN-AD-1",
11-
"base_image_ocid": "ocid1.image.oc1.iad.aaaaaaaavxqdkuyamlnrdo3q7qa7q3tsd6vnyrxjy3nmdbpv7fs7um53zh5q",
12-
"image_name": "image_name_placeholder",
13-
"shape": "VM.Standard2.1",
14-
"ssh_username": "opc",
15-
"region": "us-ashburn-1",
16-
"subnet_ocid": "ocid1.subnet.oc1.iad.aaaaaaaavycjgiklg2gtmvdxb5post7kxtkwqso3ou5ia225ziq7iskarr3q",
17-
"type": "oracle-oci"
18-
}
19-
],
20-
"provisioners": [
21-
{
22-
"type": "shell",
23-
"inline": [
24-
"#!/usr/bin/env bash",
25-
"sudo /usr/libexec/oci-image-cleanup -f"
26-
]
27-
}
28-
],
29-
"post-processors": [
30-
[
31-
{
32-
"output": "manifest.json",
33-
"strip_path": true,
34-
"type": "manifest"
35-
}
3+
"builders": [{
4+
"user_ocid": "user_ocid_placeholder",
5+
"tenancy_ocid": "tenancy_ocid_placeholder",
6+
"fingerprint": "fingerprint_placeholder",
7+
"key_file": "key_file_placeholder",
8+
"compartment_ocid": "compartment_ocid_placeholder",
9+
"availability_domain": "IYfK:US-ASHBURN-AD-1",
10+
"base_image_ocid": "ocid1.image.oc1.iad.aaaaaaaavxqdkuyamlnrdo3q7qa7q3tsd6vnyrxjy3nmdbpv7fs7um53zh5q",
11+
"image_name": "image_name_placeholder",
12+
"shape": "VM.Standard2.1",
13+
"ssh_username": "opc",
14+
"region": "us-ashburn-1",
15+
"subnet_ocid": "ocid1.subnet.oc1.iad.aaaaaaaavycjgiklg2gtmvdxb5post7kxtkwqso3ou5ia225ziq7iskarr3q",
16+
"type": "oracle-oci"
17+
}],
18+
"provisioners": [{
19+
"type": "shell",
20+
"inline": [
21+
"#!/usr/bin/env bash",
22+
"sudo /usr/libexec/oci-image-cleanup -f"
3623
]
24+
}],
25+
"post-processors": [
26+
[{
27+
"output": "manifest.json",
28+
"strip_path": true,
29+
"type": "manifest"
30+
}]
3731
]
3832
}

actions/unused-create-partner-image/Dockerfile

Lines changed: 0 additions & 8 deletions
This file was deleted.

actions/unused-create-partner-image/action.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

actions/unused-create-partner-image/entrypoint.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

actions/unused-create-partner-image/marketplace_image.json

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)