Merge branch 'master' into 65-languages-is-an-object

This commit is contained in:
Alejandro Matos
2021-12-06 22:56:55 -05:00
2 changed files with 8 additions and 2 deletions
+6 -1
View File
@@ -1,4 +1,9 @@
FROM maven:3-openjdk-17-slim as build
WORKDIR /
COPY . .
RUN mvn --batch-mode package
FROM openjdk:14-alpine
COPY target/dev.amatos.restcountries-*.jar dev.amatos.restcountries.jar
COPY --from=build target/dev.amatos.restcountries-*.jar dev.amatos.restcountries.jar
EXPOSE 8080
CMD ["java", "-Dcom.sun.management.jmxremote", "-Xmx128m", "-jar", "dev.amatos.restcountries.jar"]
+2 -1
View File
@@ -1368,6 +1368,7 @@
}
],
"demonym": "Azerbaijani",
"independent": true,
"flag": "https://flagcdn.com/az.svg",
"flags": {
"svg": "https://flagcdn.com/az.svg",
@@ -22174,4 +22175,4 @@
},
"cioc": "ZIM"
}
]
]