Client - update docker files
This commit is contained in:
		
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							@@ -98,7 +98,7 @@ docker-run-workers:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
docker-serve-client:
 | 
					docker-serve-client:
 | 
				
			||||||
	docker-compose -f docker-compose-dev.yml up -d fittrackee_client
 | 
						docker-compose -f docker-compose-dev.yml up -d fittrackee_client
 | 
				
			||||||
	docker-compose -f docker-compose-dev.yml exec fittrackee_client yarn serve
 | 
						docker-compose -f docker-compose-dev.yml exec fittrackee_client yarn dev
 | 
				
			||||||
 | 
					
 | 
				
			||||||
docker-set-admin:
 | 
					docker-set-admin:
 | 
				
			||||||
	docker-compose -f docker-compose-dev.yml exec fittrackee docker/set-admin.sh $(USERNAME)
 | 
						docker-compose -f docker-compose-dev.yml exec fittrackee docker/set-admin.sh $(USERNAME)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,7 +36,7 @@ services:
 | 
				
			|||||||
    container_name: fittrackee_client
 | 
					    container_name: fittrackee_client
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - NODE_ENV=development
 | 
					      - NODE_ENV=development
 | 
				
			||||||
      - VUE_APP_API_URL=http://localhost:5000
 | 
					      - VITE_APP_API_URL=http://localhost:5000
 | 
				
			||||||
    build:
 | 
					    build:
 | 
				
			||||||
      context: ./fittrackee_client
 | 
					      context: ./fittrackee_client
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,14 +11,14 @@ ENV PATH /usr/src/app/node_modules/.bin:$PATH
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# add environment variables
 | 
					# add environment variables
 | 
				
			||||||
ARG NODE_ENV
 | 
					ARG NODE_ENV
 | 
				
			||||||
ARG VUE_APP_API_URL
 | 
					ARG VITE_APP_API_URL
 | 
				
			||||||
ENV NODE_ENV $NODE_ENV
 | 
					ENV NODE_ENV $NODE_ENV
 | 
				
			||||||
ENV VUE_APP_API_URL $VUE_APP_API_URL
 | 
					ENV VITE_APP_API_URL $VITE_APP_API_URL
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# install dependencies
 | 
					# install dependencies
 | 
				
			||||||
COPY package.json /usr/src/app/package.json
 | 
					COPY package.json /usr/src/app/package.json
 | 
				
			||||||
 | 
					COPY yarn.lock /usr/src/app/yarn.lock
 | 
				
			||||||
RUN yarn install --silent
 | 
					RUN yarn install --silent
 | 
				
			||||||
RUN yarn global add @vue/cli
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# copy source
 | 
					# copy source
 | 
				
			||||||
COPY . /usr/src/app/
 | 
					COPY . /usr/src/app/
 | 
				
			||||||
@@ -17,6 +17,7 @@ export default defineConfig({
 | 
				
			|||||||
    },
 | 
					    },
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  server: {
 | 
					  server: {
 | 
				
			||||||
 | 
					    host: true,
 | 
				
			||||||
    port: 3000,
 | 
					    port: 3000,
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  build: {
 | 
					  build: {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user