diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 74b0218..258c74d 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -17,4 +17,4 @@ RUN true \ # && true -COPY ./build /usr/local/apache2/htdocs/ \ No newline at end of file +COPY ./dist /usr/local/apache2/htdocs/ \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json index b359ba5..0c61895 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -8,7 +8,10 @@ "dev": "vite", "build": "tsc && vite build", "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", - "preview": "vite preview" + "preview": "vite preview", + "predocker:build": "env REACT_APP_VERSION=${IMAGE_VERSION:-$(npm run --silent version)} npm run build", + "docker:build": "docker build -t ${IMAGE_BASE:-$npm_package_imageBase}frontend:${IMAGE_VERSION:-$(npm run --silent version)} .", + "version": "echo $(echo $npm_package_version | sed 's/\\.[0-9]*$//').$(git rev-list HEAD --count)" }, "dependencies": { "@emotion/react": "^11.11.3", @@ -38,4 +41,4 @@ "typescript": "^5.2.2", "vite": "^5.0.8" } -} +} \ No newline at end of file