From e99ce38cd46cdced17e641a6eba16b91408b2269 Mon Sep 17 00:00:00 2001 From: joanEstrada Date: Tue, 13 Feb 2024 12:23:30 -0500 Subject: [PATCH 1/3] Fixed with latest stable version --- base.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base.dockerfile b/base.dockerfile index c012708..fb99184 100644 --- a/base.dockerfile +++ b/base.dockerfile @@ -10,7 +10,7 @@ ENV PATH="/var/task/venv/bin:${PATH}" WORKDIR /usr/local # This link can be out of date. Check the latest version at https://www.libreoffice.org/download/download/ -RUN wget https://download.documentfoundation.org/libreoffice/stable/7.5.5/rpm/x86_64/LibreOffice_7.5.5_Linux_x86-64_rpm.tar.gz +RUN wget https://download.documentfoundation.org/libreoffice/stable/7.5.8/rpm/x86_64/LibreOffice_7.5.8_Linux_x86-64_rpm.tar.gz RUN tar -xzf LibreOffice_7.5.5_Linux_x86-64_rpm.tar.gz WORKDIR /usr/local/LibreOffice_7.5.5.2_Linux_x86-64_rpm/RPMS RUN yum localinstall *.rpm -y From c443f668379f576dca95b3075d2f0c60b112182e Mon Sep 17 00:00:00 2001 From: joanEstrada Date: Tue, 13 Feb 2024 12:58:52 -0500 Subject: [PATCH 2/3] Fixed further mentions --- base.dockerfile | 10 +++++----- requirements.txt | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 requirements.txt diff --git a/base.dockerfile b/base.dockerfile index fb99184..05b1c13 100644 --- a/base.dockerfile +++ b/base.dockerfile @@ -11,14 +11,14 @@ ENV PATH="/var/task/venv/bin:${PATH}" WORKDIR /usr/local # This link can be out of date. Check the latest version at https://www.libreoffice.org/download/download/ RUN wget https://download.documentfoundation.org/libreoffice/stable/7.5.8/rpm/x86_64/LibreOffice_7.5.8_Linux_x86-64_rpm.tar.gz -RUN tar -xzf LibreOffice_7.5.5_Linux_x86-64_rpm.tar.gz -WORKDIR /usr/local/LibreOffice_7.5.5.2_Linux_x86-64_rpm/RPMS +RUN tar -xzf LibreOffice_7.5.8_Linux_x86-64_rpm.tar.gz +WORKDIR /usr/local/LibreOffice_7.5.8_Linux_x86-64_rpm/RPMS RUN yum localinstall *.rpm -y -RUN rm -rf /usr/local/LibreOffice_7.5.5_Linux_x86-64_rpm.tar.gz /usr/local/LibreOffice_7.5.5.2_Linux_x86-64_rpm +RUN rm -rf /usr/local/LibreOffice_7.5.8_Linux_x86-64_rpm.tar.gz /usr/local/LibreOffice_7.5.8_Linux_x86-64_rpm # Set environment variables for LibreOffice -ENV PATH="/usr/local/LibreOffice_7.5.5.2_Linux_x86-64_rpm/RPMS/desktop-integration:${PATH}" -ENV LIBREOFFICE_PATH="/usr/local/LibreOffice_7.5.5.2_Linux_x86-64_rpm/RPMS/desktop-integration" +ENV PATH="/usr/local/LibreOffice_7.5.8_Linux_x86-64_rpm/RPMS/desktop-integration:${PATH}" +ENV LIBREOFFICE_PATH="/usr/local/LibreOffice_7.5.8_Linux_x86-64_rpm/RPMS/desktop-integration" # THE NEXT TWO LINES ARE FOR LOCAL TESTING # ENTRYPOINT [] diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..3778c54 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +boto3==1.20.0 \ No newline at end of file From 7919d701a7009ee9983bcc3ad01c11e35f594eee Mon Sep 17 00:00:00 2001 From: joanEstrada Date: Tue, 13 Feb 2024 14:32:19 -0500 Subject: [PATCH 3/3] build image replacing --- lambda.dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lambda.dockerfile b/lambda.dockerfile index 98c3c09..c6bb818 100644 --- a/lambda.dockerfile +++ b/lambda.dockerfile @@ -1,14 +1,15 @@ # TO BUILD FROM LOCALLY STORED DIRECTORY FROM base-image:latest # TO BUILD FROM ECR URL -# FROM 138379163455.dkr.ecr.us-east-2.amazonaws.com/organizer-base-images-repository:libreoffice-base-image +FROM 299862984411.dkr.ecr.us-west-2.amazonaws.com/microservice-docx2pdf:base + WORKDIR ${LAMBDA_TASK_ROOT} RUN echo $(pwd) COPY main.py requirements.txt ${LAMBDA_TASK_ROOT}/ -COPY helpers ${LAMBDA_TASK_ROOT}/helpers +#COPY helpers ${LAMBDA_TASK_ROOT}/helpers RUN PYTHON_VERSION=$(python3 --version | cut -d " " -f 2 | cut -d "." -f 1-2) && \ pip install -r requirements.txt -t /var/lang/lib/python${PYTHON_VERSION}/site-packages/