fix dockerfile / makefile (#72)
* update Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix ci Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix Signed-off-by: Jess Frazelle <github@jessfraz.com> * I have generated the latest API! --------- Signed-off-by: Jess Frazelle <github@jessfraz.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
This commit is contained in:
@ -3,9 +3,9 @@ FROM python:3.9
|
||||
RUN pip install \
|
||||
poetry
|
||||
|
||||
WORKDIR /usr/src/
|
||||
WORKDIR /home/user/src/
|
||||
|
||||
COPY . /usr/src/
|
||||
COPY . /home/user/src/
|
||||
|
||||
RUN poetry update && poetry install
|
||||
|
||||
|
8
Makefile
8
Makefile
@ -14,8 +14,8 @@ generate: docker-image ## Generate the api client.
|
||||
docker run --rm -i $(DOCKER_FLAGS) \
|
||||
--name python-generator \
|
||||
--disable-content-trust \
|
||||
-v $(CURDIR):/usr/src \
|
||||
--workdir /usr/src \
|
||||
-v $(CURDIR):/home/user/src \
|
||||
--workdir /home/user/src \
|
||||
$(DOCKER_IMAGE_NAME) ./generate/run.sh
|
||||
|
||||
.PHONY: shell
|
||||
@ -24,8 +24,8 @@ shell: docker-image ## Pop into a shell in the docker image.
|
||||
--name python-generator-shell \
|
||||
-e KITTYCAD_API_TOKEN \
|
||||
--disable-content-trust \
|
||||
-v $(CURDIR):/usr/src \
|
||||
--workdir /usr/src \
|
||||
-v $(CURDIR):/home/user/src \
|
||||
--workdir /home/user/src \
|
||||
$(DOCKER_IMAGE_NAME) /bin/bash
|
||||
|
||||
|
||||
|
@ -2,6 +2,9 @@
|
||||
set -e
|
||||
set -o pipefail
|
||||
|
||||
# Fix for ci.
|
||||
git config --global --add safe.directory /home/user/src
|
||||
|
||||
# Cleanup old stuff.
|
||||
rm -rf kittycad/models
|
||||
rm -rf kittycad/api
|
||||
|
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user