diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/.gitmodules b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/.gitmodules similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/.gitmodules rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/.gitmodules diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/LICENSE.txt b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/LICENSE.txt similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/LICENSE.txt rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/LICENSE.txt diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/Makefile b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/Makefile similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/Makefile rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/Makefile diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/README.md b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/README.md similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/README.md rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/README.md diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/ci/jfrog-new-vpc-jcr6-ecs.json b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/ci/jfrog-new-vpc-jcr6-ecs.json similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/ci/jfrog-new-vpc-jcr6-ecs.json rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/ci/jfrog-new-vpc-jcr6-ecs.json diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/ci/taskcat.yml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/ci/taskcat.yml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/ci/taskcat.yml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/ci/taskcat.yml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/README.md b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/README.md similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/README.md rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/README.md diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/defaults/main.yml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/defaults/main.yml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/defaults/main.yml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/defaults/main.yml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/files/inactiveServerCleaner.groovy b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/files/inactiveServerCleaner.groovy similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/files/inactiveServerCleaner.groovy rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/files/inactiveServerCleaner.groovy diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/files/installer-info.json b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/files/installer-info.json similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/files/installer-info.json rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/files/installer-info.json diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/files/nginx.conf b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/files/nginx.conf similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/files/nginx.conf rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/files/nginx.conf diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/handlers/main.yml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/handlers/main.yml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/handlers/main.yml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/handlers/main.yml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/meta/main.yml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/meta/main.yml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/meta/main.yml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/meta/main.yml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/configure.yml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/configure.yml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/configure.yml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/configure.yml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/configure_ecs.yml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/configure_ecs.yml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/configure_ecs.yml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/configure_ecs.yml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/install.yml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/install.yml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/install.yml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/install.yml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/main.yml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/main.yml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/main.yml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/main.yml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/nginx-setup.yml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/nginx-setup.yml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/nginx-setup.yml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/tasks/nginx-setup.yml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/artifactory.cluster.license.j2 b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/artifactory.cluster.license.j2 similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/artifactory.cluster.license.j2 rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/artifactory.cluster.license.j2 diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/artifactory.conf.j2 b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/artifactory.conf.j2 similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/artifactory.conf.j2 rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/artifactory.conf.j2 diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/binarystore.xml.j2 b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/binarystore.xml.j2 similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/binarystore.xml.j2 rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/binarystore.xml.j2 diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/certificate.key.j2 b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/certificate.key.j2 similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/certificate.key.j2 rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/certificate.key.j2 diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/certificate.pem.j2 b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/certificate.pem.j2 similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/certificate.pem.j2 rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/certificate.pem.j2 diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/db.properties.j2 b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/db.properties.j2 similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/db.properties.j2 rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/db.properties.j2 diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/ha-node.properties.j2 b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/ha-node.properties.j2 similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/ha-node.properties.j2 rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/ha-node.properties.j2 diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/master.key.j2 b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/master.key.j2 similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/master.key.j2 rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/roles/artifactory/templates/master.key.j2 diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/site-artifactory.yml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/site-artifactory.yml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/scripts/site-artifactory.yml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/scripts/site-artifactory.yml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs-ec2.template.yaml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs-ec2.template.yaml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs-ec2.template.yaml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs-ec2.template.yaml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs-existing-vpc.template.yaml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs-existing-vpc.template.yaml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs-existing-vpc.template.yaml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs-existing-vpc.template.yaml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs-master.template.yaml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs-master.template.yaml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs-master.template.yaml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs-master.template.yaml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs.template.yaml b/JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs.template.yaml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs.template.yaml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-ECS/templates/jfrog-jcr6-ecs.template.yaml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-EKS/.gitmodules b/JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/.gitmodules similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-EKS/.gitmodules rename to JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/.gitmodules diff --git a/JFrogContainerRegistry/CloudFormation-JCR-EKS/LICENSE.txt b/JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/LICENSE.txt similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-EKS/LICENSE.txt rename to JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/LICENSE.txt diff --git a/JFrogContainerRegistry/CloudFormation-JCR-EKS/Makefile b/JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/Makefile similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-EKS/Makefile rename to JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/Makefile diff --git a/JFrogContainerRegistry/CloudFormation-JCR-EKS/README.md b/JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/README.md similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-EKS/README.md rename to JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/README.md diff --git a/JFrogContainerRegistry/CloudFormation-JCR-EKS/ci/jfrog-new-vpc-jcr6-eks.json b/JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/ci/jfrog-new-vpc-jcr6-eks.json similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-EKS/ci/jfrog-new-vpc-jcr6-eks.json rename to JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/ci/jfrog-new-vpc-jcr6-eks.json diff --git a/JFrogContainerRegistry/CloudFormation-JCR-EKS/ci/taskcat.yml b/JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/ci/taskcat.yml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-EKS/ci/taskcat.yml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/ci/taskcat.yml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-EKS/templates/jfrog-jcr6-eks-core-workload.template.yaml b/JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/templates/jfrog-jcr6-eks-core-workload.template.yaml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-EKS/templates/jfrog-jcr6-eks-core-workload.template.yaml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/templates/jfrog-jcr6-eks-core-workload.template.yaml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-EKS/templates/jfrog-jcr6-eks-existing-vpc.template.yaml b/JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/templates/jfrog-jcr6-eks-existing-vpc.template.yaml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-EKS/templates/jfrog-jcr6-eks-existing-vpc.template.yaml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/templates/jfrog-jcr6-eks-existing-vpc.template.yaml diff --git a/JFrogContainerRegistry/CloudFormation-JCR-EKS/templates/jfrog-jcr6-eks-master.template.yaml b/JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/templates/jfrog-jcr6-eks-master.template.yaml similarity index 100% rename from JFrogContainerRegistry/CloudFormation-JCR-EKS/templates/jfrog-jcr6-eks-master.template.yaml rename to JFrogContainerRegistry/aws/CloudFormation-JCR-EKS/templates/jfrog-jcr6-eks-master.template.yaml diff --git a/JFrogContainerRegistry/HelmInstall/README.md b/JFrogContainerRegistry/aws/HelmInstall/README.md similarity index 100% rename from JFrogContainerRegistry/HelmInstall/README.md rename to JFrogContainerRegistry/aws/HelmInstall/README.md diff --git a/JFrogContainerRegistry/aws/container/README.md b/JFrogContainerRegistry/aws/container/README.md new file mode 100644 index 0000000..95911b7 --- /dev/null +++ b/JFrogContainerRegistry/aws/container/README.md @@ -0,0 +1,46 @@ +# JFrog Container Registry for AWS Container Marketplace + +JFrog Container Registry can be installed into either an ECS or EKS cluster. + +### Prerequisites +* AWS account +* EKS or ECS cluster +#### Recommended requirements +* S3 +* ELB/ALB +* RDS +* Valid SSL certificate +* EBS (for persistent storage) + +### For testing only + +To simply get up and running, you can try: + +```docker run -d -p 8081:8081 ``` +After this, you can access the UI at :8081. The default username is 'admin'. See 'Getting or setting initial password' to find out how to get the initial password. + +### Getting or setting initial password +If no initial password is provided for the default user 'admin', one will be generated and saved to the container at '/var/opt/jfrog/artifactory/generated-pass.txt'. + +You can print it out with a Docker command: +```docker exec -it cat /var/opt/jfrog/artifactory/generated-pass.txt``` + +You can also set a default password by passing it as an environment variable (ARTIFACTORY_PASSWORD) during container creation: +```docker run -d -p 8081:8081 --env ARTIFACTORY-PASSWORD= ``` + + +### For production + +1. Set up an [RDS](https://aws.amazon.com/rds/) (PSQL is the preferred database) +2. Set up an [S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html#create-bucket-intro) +3. Run the Docker image, pointing it to the RDS, S3 and to some persistent storage (EBS) + * See [S3 Binarystore Configuration](https://www.jfrog.com/confluence/display/JCR/Configuring+the+Filestore#ConfiguringtheFilestore-AmazonS3OfficialSDKTemplate) for more information + * See [Configuring the databse](https://www.jfrog.com/confluence/display/JCR/Configuring+the+Database) for more information + * See [Extra Configuration](https://www.jfrog.com/confluence/display/JCR/Installing+with+Docker#InstallingwithDocker-ExtraConfigurationDirectory) to learn how to pass this information to the Docker container + * Create a medium sized mount point (~50GB) on /var/opt/jfrog/artifactory. See [Managing Data Persistence](https://www.jfrog.com/confluence/display/JCR/Installing+with+Docker#InstallingwithDocker-ManagingDataPersistence) +4. Expose the service (running on port 8081) via a load balancer to port 443 + * Docker requires a valid SSL certificate +5. Learn how to use your [JFrog Container Registry](https://www.jfrog.com/confluence/display/JCR/Overview) + * See 'Getting or setting initial password' + +