From 5ff8f35fe9b871ac0523215c23dab02c342ee554 Mon Sep 17 00:00:00 2001 From: "ivan.kaliuzhnyi" Date: Wed, 3 Dec 2025 13:56:00 +0000 Subject: [PATCH 1/3] docker-related + nginx --- angular-17-client/.dockerignore | 13 +++++ angular-17-client/Dockerfile | 25 ++++++++ angular-17-client/nginx.conf | 34 +++++++++++ docker-compose.yml | 57 +++++++++++++++++++ spring-boot-server/.dockerignore | 10 ++++ spring-boot-server/Dockerfile | 24 ++++++++ .../controller/TutorialController.java | 2 +- 7 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 angular-17-client/.dockerignore create mode 100644 angular-17-client/Dockerfile create mode 100644 angular-17-client/nginx.conf create mode 100644 docker-compose.yml create mode 100644 spring-boot-server/.dockerignore create mode 100644 spring-boot-server/Dockerfile diff --git a/angular-17-client/.dockerignore b/angular-17-client/.dockerignore new file mode 100644 index 0000000..f453d7d --- /dev/null +++ b/angular-17-client/.dockerignore @@ -0,0 +1,13 @@ +node_modules +dist +.angular +.vscode +.git +.gitignore +*.md +npm-debug.log +yarn-error.log +coverage +.editorconfig +karma.conf.js +.browserslistrc diff --git a/angular-17-client/Dockerfile b/angular-17-client/Dockerfile new file mode 100644 index 0000000..85bc74d --- /dev/null +++ b/angular-17-client/Dockerfile @@ -0,0 +1,25 @@ +# Stage 1: Build +FROM node:18-alpine AS build + +WORKDIR /app + +COPY package*.json ./ +# Install dependencies +RUN npm ci +# Copy application source code +COPY . . + +# Build the application +RUN npm run build + + +# Stage 2: Runtime +FROM nginx:alpine +# Copy nginx.conf (or minimalistic nginx2.conf) +COPY nginx.conf /etc/nginx/conf.d/default.conf +# Copy from build stage +COPY --from=build /app/dist/angular-17-crud/browser /usr/share/nginx/html + +EXPOSE 8081 + +CMD ["nginx", "-g", "daemon off;"] diff --git a/angular-17-client/nginx.conf b/angular-17-client/nginx.conf new file mode 100644 index 0000000..fdc103b --- /dev/null +++ b/angular-17-client/nginx.conf @@ -0,0 +1,34 @@ +server { + listen 80; + server_name localhost; + root /usr/share/nginx/html; + index index.html; + + gzip on; + gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-XSS-Protection "1; mode=block" always; + + location /api/ { + proxy_pass http://spring-boot-server:8080; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_cache_bypass $http_upgrade; + } + + location / { + try_files $uri $uri/ /index.html; + } + + location ~* \.(jpg|jpeg|png|gif|ico|css|js|svg|woff|woff2|ttf|eot)$ { + expires 1y; + add_header Cache-Control "public, immutable"; + } +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..158e08a --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,57 @@ +services: + mysql: + image: mysql:8.0 + container_name: mysql-db + environment: + MYSQL_ROOT_PASSWORD: 12345678 + MYSQL_DATABASE: testdb + ports: + - "3306:3306" + volumes: + - mysql_data:/var/lib/mysql + networks: + - app-network + healthcheck: + test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p12345678"] + interval: 10s + timeout: 5s + retries: 5 + + spring-boot-server: + build: + context: ./spring-boot-server + dockerfile: Dockerfile + container_name: spring-boot-app + environment: + SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/testdb?useSSL=false&allowPublicKeyRetrieval=true + SPRING_DATASOURCE_USERNAME: root + SPRING_DATASOURCE_PASSWORD: 12345678 + SPRING_JPA_HIBERNATE_DDL_AUTO: update + ports: + - "8080:8080" + depends_on: + mysql: + condition: service_healthy + networks: + - app-network + restart: unless-stopped + + angular-client: + build: + context: ./angular-17-client + dockerfile: Dockerfile + container_name: angular-app + ports: + - "4200:80" + depends_on: + - spring-boot-server + networks: + - app-network + restart: unless-stopped + +networks: + app-network: + driver: bridge + +volumes: + mysql_data: \ No newline at end of file diff --git a/spring-boot-server/.dockerignore b/spring-boot-server/.dockerignore new file mode 100644 index 0000000..26ef35d --- /dev/null +++ b/spring-boot-server/.dockerignore @@ -0,0 +1,10 @@ +target +.mvn +mvnw +mvnw.cmd +*.md +.git +.gitignore +.vscode +.idea +*.iml diff --git a/spring-boot-server/Dockerfile b/spring-boot-server/Dockerfile new file mode 100644 index 0000000..031acd5 --- /dev/null +++ b/spring-boot-server/Dockerfile @@ -0,0 +1,24 @@ +# Stage 1: Build +FROM maven:3.9-eclipse-temurin-17 AS build + +WORKDIR /app + +COPY pom.xml . +RUN mvn dependency:go-offline -B + +COPY src ./src + +RUN mvn clean package -DskipTests + + +# Stage 2: Run the application +FROM eclipse-temurin:17-jre-alpine + +WORKDIR /app + +# Copy the JAR from build stage +COPY --from=build /app/target/*.jar app.jar + +EXPOSE 8080 +# Run the application +ENTRYPOINT ["java", "-jar", "app.jar"] diff --git a/spring-boot-server/src/main/java/com/bezkoder/spring/datajpa/controller/TutorialController.java b/spring-boot-server/src/main/java/com/bezkoder/spring/datajpa/controller/TutorialController.java index c988754..2f79fef 100644 --- a/spring-boot-server/src/main/java/com/bezkoder/spring/datajpa/controller/TutorialController.java +++ b/spring-boot-server/src/main/java/com/bezkoder/spring/datajpa/controller/TutorialController.java @@ -21,7 +21,7 @@ import com.bezkoder.spring.datajpa.model.Tutorial; import com.bezkoder.spring.datajpa.repository.TutorialRepository; -@CrossOrigin(origins = "http://localhost:8081") +@CrossOrigin(origins = "*") @RestController @RequestMapping("/api") public class TutorialController { From d2a84b2a6c0df595fc4802de5ad05fb368edd7ae Mon Sep 17 00:00:00 2001 From: "ivan.kaliuzhnyi" Date: Wed, 3 Dec 2025 14:20:16 +0000 Subject: [PATCH 2/3] k8s-start-manifests --- kubernetes/backend-deploy.yaml | 34 +++++++++++++++++++++++++++++++++ kubernetes/backend-svc.yaml | 11 +++++++++++ kubernetes/frontend-deploy.yaml | 24 +++++++++++++++++++++++ kubernetes/frontend-svc.yaml | 11 +++++++++++ kubernetes/ingress.yaml | 1 + 5 files changed, 81 insertions(+) create mode 100644 kubernetes/backend-deploy.yaml create mode 100644 kubernetes/backend-svc.yaml create mode 100644 kubernetes/frontend-deploy.yaml create mode 100644 kubernetes/frontend-svc.yaml create mode 100644 kubernetes/ingress.yaml diff --git a/kubernetes/backend-deploy.yaml b/kubernetes/backend-deploy.yaml new file mode 100644 index 0000000..ea37b63 --- /dev/null +++ b/kubernetes/backend-deploy.yaml @@ -0,0 +1,34 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: spring-boot-backend + name: spring-boot-backend +spec: + replicas: 1 + selector: + matchLabels: + app: spring-boot-backend + strategy: + type: RollingUpdate + template: + metadata: + labels: + app: spring-boot-backend + spec: + containers: + - image: nginx:alpine + name: nginx + env: + - name: SPRING_DATASOURCE_URL + value: "jdbc:mysql://mysql:3306/testdb?useSSL=false&allowPublicKeyRetrieval=true" + - name: SPRING_DATASOURCE_USERNAME + value: "root" + - name: SPRING_DATASOURCE_PASSWORD + value: "12345678" + - name: SPRING_JPA_HIBERNATE_DDL_AUTO + value: "update" + ports: + - containerPort: 8080 + resources: {} +status: {} diff --git a/kubernetes/backend-svc.yaml b/kubernetes/backend-svc.yaml new file mode 100644 index 0000000..e6ca8d2 --- /dev/null +++ b/kubernetes/backend-svc.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: my-service +spec: + selector: + app: spring-boot-backend + ports: + - protocol: TCP + port: 8080 + targetPort: 8080 \ No newline at end of file diff --git a/kubernetes/frontend-deploy.yaml b/kubernetes/frontend-deploy.yaml new file mode 100644 index 0000000..a6ba02f --- /dev/null +++ b/kubernetes/frontend-deploy.yaml @@ -0,0 +1,24 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: angular-frontend + name: angular-frontend +spec: + replicas: 1 + selector: + matchLabels: + app: angular-frontend + strategy: {} + template: + metadata: + labels: + app: angular-frontend + spec: + containers: + - image: nginx:alpine + name: nginx + ports: + - containerPort: 80 + resources: {} +status: {} diff --git a/kubernetes/frontend-svc.yaml b/kubernetes/frontend-svc.yaml new file mode 100644 index 0000000..ad794ac --- /dev/null +++ b/kubernetes/frontend-svc.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: my-service +spec: + selector: + app: angular-frontend + ports: + - protocol: TCP + port: 80 + targetPort: 80 \ No newline at end of file diff --git a/kubernetes/ingress.yaml b/kubernetes/ingress.yaml new file mode 100644 index 0000000..ba9f433 --- /dev/null +++ b/kubernetes/ingress.yaml @@ -0,0 +1 @@ +# Ingress.yaml \ No newline at end of file From 8079c8e9b41206c87e75d8bf2509fcae7c1c28cf Mon Sep 17 00:00:00 2001 From: "ivan.kaliuzhnyi" Date: Tue, 9 Dec 2025 08:34:57 +0000 Subject: [PATCH 3/3] other image + env's in application.properties --- spring-boot-server/Dockerfile | 3 ++- .../src/main/resources/application.properties | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-boot-server/Dockerfile b/spring-boot-server/Dockerfile index 031acd5..267d86d 100644 --- a/spring-boot-server/Dockerfile +++ b/spring-boot-server/Dockerfile @@ -1,8 +1,9 @@ # Stage 1: Build -FROM maven:3.9-eclipse-temurin-17 AS build +FROM maven:3.9-eclipse-temurin-17-alpine AS build WORKDIR /app + COPY pom.xml . RUN mvn dependency:go-offline -B diff --git a/spring-boot-server/src/main/resources/application.properties b/spring-boot-server/src/main/resources/application.properties index 585fb44..99261b4 100644 --- a/spring-boot-server/src/main/resources/application.properties +++ b/spring-boot-server/src/main/resources/application.properties @@ -1,6 +1,6 @@ -spring.datasource.url= jdbc:mysql://localhost:3306/testdb?useSSL=false -spring.datasource.username= root -spring.datasource.password= 123456 +spring.datasource.url=${SPRING_DATASOURCE_URL:jdbc:mysql://localhost:3306/testdb?useSSL=false} +spring.datasource.username=${SPRING_DATASOURCE_USERNAME:root} +spring.datasource.password=${SPRING_DATASOURCE_PASSWORD:12345678} -spring.jpa.properties.hibernate.dialect= org.hibernate.dialect.MySQLDialect -spring.jpa.hibernate.ddl-auto= update \ No newline at end of file +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect +spring.jpa.hibernate.ddl-auto=${SPRING_JPA_HIBERNATE_DDL_AUTO:update} \ No newline at end of file