Skip to content

Commit 4fde7ea

Browse files
committed
Merge branch 'main' of https://github.com/CodeURJC-DAW-2021-22/webapp9 into Carlos
2 parents 04483f4 + 93075e6 commit 4fde7ea

15 files changed

+20463
-115
lines changed

docker/Dockerfile renamed to backend/gamelink/Dockerfile

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,3 @@ CMD [ "java", "-jar", "gamelink-0.0.1-SNAPSHOT.jar" ]
3838
#################################################
3939
# Base image for the application container
4040
#################################################
41-
42-
#Primera Etapa
43-
FROM node:10-alpine as build-step
44-
45-
RUN mkdir -p /app
46-
47-
WORKDIR /app
48-
49-
COPY package.json /app
50-
51-
RUN npm install
52-
53-
COPY . /app
54-
55-
RUN npm run build --prod
56-
57-
#Segunda Etapa
58-
FROM nginx:1.17.1-alpine
59-
#Si estas utilizando otra aplicacion cambia PokeApp por el nombre de tu app
60-
COPY --from=build-step /app/dist/PokeApp /usr/share/nginx/html
File renamed without changes.

backend/gamelink/create_image.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
3+
cd ../../frontend
4+
npm install
5+
ng build --base-href="/new/"
6+
7+
cp dist/frontend/* ../backend/gamelink/src/main/resources/static/new
8+
9+
cd ../backend/gamelink
10+
11+
docker build -t juanurjc/gamelink .
12+
13+
docker push juanurjc/gamelink
14+
15+
docker pull juanurjc/gamelink:latest
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)