Skip to content

Commit

Permalink
Merge branch 'master' into 65-languages-is-an-object
Browse files Browse the repository at this point in the history
  • Loading branch information
amatosg committed Dec 7, 2021
2 parents 3af3382 + baf690d commit fdb7493
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
7 changes: 6 additions & 1 deletion Dockerfile
@@ -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"]
3 changes: 2 additions & 1 deletion src/main/resources/countriesV2.json
Expand Up @@ -1368,6 +1368,7 @@
}
],
"demonym": "Azerbaijani",
"independent": true,
"flag": "https://flagcdn.com/az.svg",
"flags": {
"svg": "https://flagcdn.com/az.svg",
Expand Down Expand Up @@ -22174,4 +22175,4 @@
},
"cioc": "ZIM"
}
]
]

0 comments on commit fdb7493

Please sign in to comment.