From 434eb0ef86bc513251308ab12fb8e474140a69c0 Mon Sep 17 00:00:00 2001 From: Kurt Hutten Date: Fri, 15 Oct 2021 18:06:31 +1100 Subject: [PATCH] Release CQ customizer (#559) * Switched to Miniconda image * Update cad endpoint url and some minor tweaks Co-authored-by: Jeremy Wright Co-authored-by: Jeremy Wright --- app/api/src/docker/cadquery/Dockerfile | 7 +------ app/api/src/docker/cadquery/runCQ.ts | 2 +- app/web/src/helpers/cadPackages/common.ts | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/api/src/docker/cadquery/Dockerfile b/app/api/src/docker/cadquery/Dockerfile index e529ccf..86bfb7d 100644 --- a/app/api/src/docker/cadquery/Dockerfile +++ b/app/api/src/docker/cadquery/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/lts/ubuntu:20.04_stable +FROM continuumio/miniconda3 ENV PATH="/root/miniconda3/bin:${PATH}" ARG PATH="/root/miniconda3/bin:${PATH}" ARG DEBIAN_FRONTEND=noninteractive @@ -38,11 +38,6 @@ COPY package*.json /var/task/ RUN npm install RUN npm install aws-lambda-ric@1.0.0 -# Install Miniconda -RUN wget \ - https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh \ - && bash Miniconda3-latest-Linux-x86_64.sh -b \ - && rm -f Miniconda3-latest-Linux-x86_64.sh RUN conda --version # Install CadQuery diff --git a/app/api/src/docker/cadquery/runCQ.ts b/app/api/src/docker/cadquery/runCQ.ts index 64576cd..2f73e68 100644 --- a/app/api/src/docker/cadquery/runCQ.ts +++ b/app/api/src/docker/cadquery/runCQ.ts @@ -20,7 +20,7 @@ export const runCQ = async ({ const stlPath = `/tmp/${tempFile}/output.stl` const customizerPath = `/tmp/${tempFile}/customizer.json` const command = [ - `./cq-cli/cq-cli.py`, + `/var/task/cq-cli/cq-cli.py`, `--codec stl`, `--infile /tmp/${tempFile}/main.py`, `--outfile ${stlPath}`, diff --git a/app/web/src/helpers/cadPackages/common.ts b/app/web/src/helpers/cadPackages/common.ts index 4fac6ff..4edbd8b 100644 --- a/app/web/src/helpers/cadPackages/common.ts +++ b/app/web/src/helpers/cadPackages/common.ts @@ -4,7 +4,7 @@ import { CadhubParams } from 'src/components/Customizer/customizerConverter' export const lambdaBaseURL = process.env.CAD_LAMBDA_BASE_URL || - 'https://oxt2p7ddgj.execute-api.us-east-1.amazonaws.com/prod' + 'https://2inlbple1b.execute-api.us-east-1.amazonaws.com/prod2' export const stlToGeometry = (url) => new Promise((resolve, reject) => {