Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Dockerfile-frontend
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@
# Use a docker image with NODE to build the deliverable
# Build everywhere
####################################################################
ARG DOCKER_HUB="docker.io"
ARG NGINX_VERSION="1.17.6"
ARG NODE_VERSION="16.3-alpine"

FROM node:12 as build
FROM $DOCKER_HUB/library/node:$NODE_VERSION as build
MAINTAINER Cedrick Lunven

# Get Sources
RUN apt update && \
apt install -y git && \
RUN apk update && \
apk add git && \
git clone https://github.com/spring-petclinic/spring-petclinic-angular.git /workspace

ARG NPM_REGISTRY=" https://registry.npmjs.org"
Expand All @@ -27,7 +30,8 @@ RUN echo "export const environment = {production: false, REST_API_URL: 'http://
# Use the DIST folder to package an image with NGINX.
####################################################################

FROM nginx:1.19.4 AS runtime
FROM $DOCKER_HUB/library/nginx:$NGINX_VERSION AS runtime

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made this change upstream as well spring-petclinic#15


COPY --from=build /workspace/dist/ /usr/share/nginx/html/

Expand Down
3 changes: 2 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
version: "3.8"
services:

Expand Down Expand Up @@ -25,6 +26,7 @@ services:
- 9966:9966
- 9967:9967
environment:
CASSANDRA_USE_ASTRA: "false"

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to keep all of our edits in the kustomization.yaml, however, I found it useful to run the local docker-compose setup. This was the minimum change needed to make docker-compose work without the cloud db they advertise.

LISTENING_PORT: 9966
MONITORING_ENABLED: "true"
MONITORING_PROMETHEUS: "true"
Expand Down Expand Up @@ -89,4 +91,3 @@ services:
container_name: prometheus-server
ports:
- 9091:9090

149 changes: 0 additions & 149 deletions k8s/petclinic.asb.yaml

This file was deleted.

116 changes: 0 additions & 116 deletions k8s/petclinic.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions k8s/petclinicdb.binding.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions k8s/petclinicdb.instance.yaml

This file was deleted.

7 changes: 7 additions & 0 deletions kubernetes/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## Build instructions

* The kubernetes manifests (with the exception of the `kubernetes/k8ssandra` directory) are created through kompose by converting the docker-compose file.
```bash
cd kubernetes
kompose convert -f ../docker-compose.yml
```
Loading