Add alias path that uses `CONTAINER_PATH`

2 years ago · fcea691276
parent 6564dbbadc
commit fcea691276
4 changed files with 12 additions and 13 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -16,13 +16,6 @@ steps:
      sonar_token:
        from_secret: sonar_token

-  - name: rewrite-urls
-    image: busybox:latest
-    commands:
-      - find . -type f -exec sed -i "s|\"/|\"$${PLUGIN_CONTAINER_PATH}|g" {} +
-    settings:
-      container_path: /containers/clementfreville2-drone-health/
-
  - name: docker-build-and-push
    image: plugins/docker
    settings:
@ -34,8 +27,6 @@ steps:
         from_secret: SECRET_REGISTRY_USERNAME
       password:
         from_secret: SECRET_REGISTRY_PASSWORD
-    depends_on:
-      - rewrite-urls

  - name: deploy-container
    image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
@ -44,6 +35,7 @@ steps:
        CONTAINERNAME: drone-health
        COMMAND: create
        OVERWRITE: true
-        CODEFIRST_CLIENTDRONE_ENV_CONTAINER_PATH: clement.freville2-drone-health/
+        # Don't add a trailing slash here
+        CODEFIRST_CLIENTDRONE_ENV_CONTAINER_PATH: /containers/clement.freville2-drone-health
    depends_on:
      - docker-build-and-push
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,3 +1,4 @@
 FROM php:8.2-apache

+COPY docker/vhost.conf /etc/apache2/sites-available/000-default.conf
 COPY . /var/www/html/
--- a/docker/vhost.conf
+++ b/docker/vhost.conf
@ -0,0 +1,6 @@
+<VirtualHost *:80>
+    DocumentRoot /var/www/html
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+    Alias ${CONTAINER_PATH} /var/www/html/
+</VirtualHost>
--- a/index.html
+++ b/index.html
@ -1,8 +1,8 @@
 <!DOCTYPE html>
-<html html="en">
+<html lang="en">
 <head>
  <title>drone-health - One incredible styled html page</title>
-  <link rel="stylesheet" href="/mycoolstyle.css">
+  <link rel="stylesheet" href="mycoolstyle.css">
 </head>

 <body>
@ -28,7 +28,7 @@

 <footer>
 <address>Template made in 2022<br>
-  with Code#0 <a href="https://codefirst.iut.uca.fr/home"><img src="images/CodeFirstLogo.png" alt="Code#0" align="middle" border="0" height="40px"/>
+  with Code#0 <a href="https://codefirst.iut.uca.fr/home"><img src="images/CodeFirstLogo.png" alt="Code#0" height="40px"/>
  </a></address>
 </footer>