h3n3/cadhub
1
0
Fork 0
Code Issues 35 Pull Requests Packages Projects Releases Wiki Activity

Release CQ customizer (#559)

Browse Source 
* Switched to Miniconda image

* Update cad endpoint url

and some minor tweaks

Co-authored-by: Jeremy Wright <wrightjmf@gmail.com>

Co-authored-by: Jeremy Wright <wrightjmf@gmail.com>
This commit was merged in pull request #559.
This commit is contained in:
Kurt Hutten
2021-10-15 18:06:31 +11:00
committed by GitHub
parent 96ee9c4aa4
commit 434eb0ef86
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/api/src/docker/cadquery/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM public.ecr.aws/lts/ubuntu:20.04_stable FROM continuumio/miniconda3
ENV PATH="/root/miniconda3/bin:${PATH}" ENV PATH="/root/miniconda3/bin:${PATH}"
ARG PATH="/root/miniconda3/bin:${PATH}" ARG PATH="/root/miniconda3/bin:${PATH}"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@@ -38,11 +38,6 @@ COPY package*.json /var/task/
RUN npm install RUN npm install
RUN npm install aws-lambda-ric@1.0.0 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 RUN conda --version
# Install CadQuery # Install CadQuery

2
app/api/src/docker/cadquery/runCQ.ts
View File

@@ -20,7 +20,7 @@ export const runCQ = async ({
const stlPath = `/tmp/${tempFile}/output.stl` const stlPath = `/tmp/${tempFile}/output.stl`
const customizerPath = `/tmp/${tempFile}/customizer.json` const customizerPath = `/tmp/${tempFile}/customizer.json`
const command = [ const command = [
`./cq-cli/cq-cli.py`, `/var/task/cq-cli/cq-cli.py`,
`--codec stl`, `--codec stl`,
`--infile /tmp/${tempFile}/main.py`, `--infile /tmp/${tempFile}/main.py`,
`--outfile ${stlPath}`, `--outfile ${stlPath}`,

2
app/web/src/helpers/cadPackages/common.ts
View File

@@ -4,7 +4,7 @@ import { CadhubParams } from 'src/components/Customizer/customizerConverter'
export const lambdaBaseURL = export const lambdaBaseURL =
process.env.CAD_LAMBDA_BASE_URL || 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) => export const stlToGeometry = (url) =>
new Promise((resolve, reject) => { new Promise((resolve, reject) => {