Merge pull request #488 from spdx/dockerprod

update docker production file

README-PRODUCTION.md

@@ -22,7 +22,7 @@ Following are the steps for updating the images:
 
 * Deploy the images on EC2
   * Clone this repo on the EC2 instance - a convenient way to copy of the docker-compose files
-  * Login to ECR using the AWS CLI by running `aws ecr get-login-password --region <aws-region> | docker login --username AWS --password-stdin <aws-account-id>.dkr.ecr.<aws-region>.amazonaws.com` replacing the region and account ID
+  * Login to ECR using the AWS CLI by running `sudo docker login -u AWS -p $(aws ecr get-login-password --region <region>) <accountid>.dkr.ecr.<region>.amazonaws.com` replacing the region and account ID
   * Pull the online-tools image by running `docker pull <aws-account-id>.dkr.ecr.<aws-region>.amazonaws.com/spdx/online-tools:<version>` replacing the <aws-account-id>, <aws-region>, and <version>
   * Launch the containers with the command `docker-compose -f docker-compose.prod.yml up -d`
   * If needed upgrade the database:
@@ -36,8 +36,8 @@ Following are the steps for updating the images:
 Following are the steps for a clean initial installaction of the application:
 
 * Launch an AWS EC2 instance
-  * Reccomend Ubuntu Server 18.04 LTS (HVM)
-  * Reccomend T2 medium
+  * Reccomend Ubuntu Server 22.04.2 LTS (HVM)
+  * Reccomend T3 large
 * Login to the instance and install Docker, Docker-Compose, and AWS CLI
   * See Docker [Installation for Ubuntu](https://docs.docker.com/engine/install/ubuntu/)
   * Dowload docker-compose: `sudo curl -L "https://github.com/docker/compose/releases/download/1.26.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose`

docker-compose.prod.yml

@@ -31,7 +31,7 @@ services:
     build:
       context: ./
       dockerfile: dockerfile.prod
-    image: 410487266669.dkr.ecr.us-west-2.amazonaws.com/spdx/online-tools:1.2.0
+    image: 410487266669.dkr.ecr.us-west-2.amazonaws.com/spdx/online-tools:1.2.1
     expose:
       - 8000
     volumes:

dockerfile.prod

@@ -59,23 +59,3 @@ RUN mv ./supervisor_api.conf /etc/supervisor/conf.d
 
 # Start the supervisor
 CMD /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf
-
-# Install necessary packages
-RUN apt-get update && \
-    apt-get install -y cron && \
-    rm -rf /var/lib/apt/lists/*
-
-# Set the working directory
-WORKDIR /spdx
-
-# Add the crontab file
-ADD crontab /etc/cron.d/cleanup-cron
-
-# Give execution rights on the cron job
-RUN chmod 0644 /etc/cron.d/cleanup-cron
-
-# Apply cron job
-RUN crontab /etc/cron.d/cleanup-cron
-
-# Run the command on container startup
-CMD ["cron", "-f"]

src/src/version.py

@@ -26,7 +26,7 @@ def get_tools_version(jar_name):
     return 'Unknown'
 
 
-spdx_online_tools_version = '1.2.0'
+spdx_online_tools_version = '1.2.1'
 
 """
 Visit https://github.com/spdx/tools-java/releases to know about the tools releases.