Merge pull request #15 from creativecommons/minimize-docker

TimidRobot · web-flow · commit 541d0a156da6 · 2024-08-27T11:17:45.000-07:00
Minimize docker
diff --git a/README.md b/README.md
@@ -92,6 +92,12 @@ The SSH setup has been established and is currently in use for the Ansible conta
 **SSH connection from bastion**:
 - ProxyJump allow you to use `ssh bastion` to connect to the bastion-dev host, and `ssh ansible-dev` or `ssh web-dev`, and SSH will automatically connect through the bastion jump host.
 - currently, db-dev is not handled through bastion
+- Execute the following command to add ssh agent
+
+    ```shell
+    ssh-add ./sysadmin-ssh-keys/rsa_sysadmin
+    ```
+
 - Execute the following command to confirm the bastion connection:
 
     ```shell
diff --git a/ansible/Dockerfile b/ansible/Dockerfile
@@ -49,11 +49,17 @@ RUN mkdir /etc/ansible/
 WORKDIR /etc/ansible/
 
 # Set environment variables for Ansible
-ENV PATH="/opt/ansible-venv/bin:$PATH"
 ENV ANSIBLE_CONFIG=/etc/ansible/ansible.cfg
+ENV PATH="/opt/ansible-venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
+# Add commands to set environment variables in .bashrc
+RUN echo 'export ANSIBLE_CONFIG=/etc/ansible/ansible.cfg' >> /home/sysadmin/.bashrc
+RUN echo 'export PATH=/opt/ansible-venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' >> /home/sysadmin/.bashrc
+RUN echo 'export LANG=en_US.UTF-8' >> /home/sysadmin/.bashrc
+RUN echo 'export LC_ALL=C.UTF-8' >> /home/sysadmin/.bashrc
 
 # Expose SSH port
 EXPOSE 22
 
 # Start SSH service
-CMD ["/usr/sbin/sshd", "-D"]
+CMD ["/usr/sbin/sshd", "-D"]
diff --git a/ansible/etc-ansible-config/roles/wordpress/tasks/main.yml b/ansible/etc-ansible-config/roles/wordpress/tasks/main.yml
@@ -1,3 +1,20 @@
+- name: Install packages
+  apt:
+    name:
+      - libapache2-mod-php
+      - mariadb-client
+      - php8.2
+      - php8.2-mbstring
+      - php8.2-mysql
+      - php8.2-pdo
+      - php8.2-xml
+    state: latest
+
+- name: Config PHP
+  copy:
+    src: /etc/ansible/web/etc-php-8.2-apache2-conf.d/90-local.ini
+    dest: /etc/php/8.2/apache2/conf.d/
+
 - name: Add Apache2's www-data user to sudo group
   user:
     name: www-data
@@ -18,6 +35,45 @@
     group: www-data
     mode: '0755'
 
+- name: Ensure /var/www/dev/ is writable by www-data
+  file:
+    path: /var/www/dev/
+    state: directory
+    owner: www-data
+    group: www-data
+    mode: '0755'
+
+- name: Enable Apache modules headers
+  community.general.apache2_module:
+    state: present
+    name: headers
+
+- name: Disable conflicting Apache module mpm_event
+  apache2_module:
+    name: mpm_event
+    state: absent
+
+- name: Disable conflicting Apache module mpm_worker
+  apache2_module:
+    name: mpm_worker
+    state: absent
+
+- name: Disable conflicting Apache module php5
+  apache2_module:
+    name: php5
+    state: absent
+
+- name: Check if php_module is enabled
+  command: apache2ctl -M
+  register: apache_modules
+
+- name: Enable Apache module php8.2
+  apache2_module:
+    name: php8.2
+    state: present
+    identifier: php_module
+  when: "'php_module' not in apache_modules.stdout"
+
 - name: Install WordPress CLI (WP-CLI)
   get_url:
     url: https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
@@ -76,4 +132,8 @@
     ' /var/www/dev/wp-config.php > /var/www/dev/wp-config.tmp \
     && mv /var/www/dev/wp-config.tmp /var/www/dev/wp-config.php
   args:
-    chdir: /var/www/dev
+    chdir: /var/www/dev
+
+- name: Ensure that apache2 is started
+  become: true
+  service: name=apache2 state=started
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,6 +10,7 @@ services:
       - dev-backend
     volumes:
       - ./ansible/etc-ansible-config:/etc/ansible/
+      - ./web/etc-php-8.2-apache2-conf.d:/etc/ansible/web/etc-php-8.2-apache2-conf.d
       - ./sysadmin-ssh-keys/rsa_sysadmin:/home/sysadmin/.ssh/id_rsa:ro
       - ./sysadmin-ssh-keys/rsa_sysadmin.pub:/home/sysadmin/.ssh/id_rsa.pub:ro
       - ./sysadmin-ssh-keys/rsa_sysadmin.pub:/home/sysadmin/.ssh/authorized_keys:ro
@@ -25,6 +26,11 @@ services:
     build:
       args:
         WP_VERSION: ${WP_VERSION:?have you copied .env.example to .env?}
+        WORDPRESS_DB_HOST: db-dev:3306
+        WORDPRESS_DB_PASSWORD: root
+        WORDPRESS_DB_USER: root
+        WORDPRESS_DB_NAME: wordpress
+        WORDPRESS_USER: root
       context: .
       dockerfile: web/Dockerfile
     networks:
@@ -34,19 +40,6 @@ services:
       MYSQL_ROOT_PASSWORD: root
       PMA_HOST: db-dev
       PMA_PORT: 3306
-      WORDPRESS_CONFIG_EXTRA: |
-        # Use dispatch port by default
-        if ('${CODESPACE_NAME:-}') {
-          define('WP_HOME', 'https://${CODESPACE_NAME:-}-8080.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN:-}');
-        } else {
-          define('WP_HOME', 'http://localhost:8080');
-          define('WP_SITEURL', 'http://localhost:8080');
-        }
-      WORDPRESS_DB_HOST: db-dev:3306
-      WORDPRESS_DB_PASSWORD: root
-      WORDPRESS_DB_USER: root
-      WORDPRESS_DB_NAME: wordpress
-      WORDPRESS_USER: root
     init: true
     ports:
       - '8080:80'
diff --git a/web/Dockerfile b/web/Dockerfile
@@ -21,13 +21,6 @@ RUN apt-get install -y \
     curl \
     git \
     less \
-    libapache2-mod-php \
-    mariadb-client \
-    php8.2 \
-    php8.2-mbstring \
-    php8.2-mysql \
-    php8.2-pdo \
-    php8.2-xml \
     python3 \
     sudo \
     unzip \
@@ -37,6 +30,18 @@ RUN apt-get install -y \
     openssh-server \
     && update-ca-certificates
 
+# Make sure that apache can get the environment variables we need
+ARG WORDPRESS_DB_HOST
+ARG WORDPRESS_DB_PASSWORD
+ARG WORDPRESS_DB_USER
+ARG WORDPRESS_DB_NAME
+ARG WORDPRESS_USER
+RUN echo "SetEnv WORDPRESS_DB_HOST ${WORDPRESS_DB_HOST}" >> /etc/apache2/conf-enabled/environment.conf
+RUN echo "SetEnv WORDPRESS_DB_PASSWORD ${WORDPRESS_DB_PASSWORD}" >> /etc/apache2/conf-enabled/environment.conf
+RUN echo "SetEnv WORDPRESS_DB_USER ${WORDPRESS_DB_USER}" >> /etc/apache2/conf-enabled/environment.conf
+RUN echo "SetEnv WORDPRESS_DB_NAME ${WORDPRESS_DB_NAME}" >> /etc/apache2/conf-enabled/environment.conf
+RUN echo "SetEnv WORDPRESS_USER ${WORDPRESS_USER}" >> /etc/apache2/conf-enabled/environment.conf
+
 # Clean up packages: Saves space by removing unnecessary package files and lists
 RUN apt-get clean
 RUN rm -rf /var/lib/apt/lists/*
@@ -57,14 +62,8 @@ RUN mkdir -p /home/sysadmin/.ssh && \
 # Create privilege separation directory for SSH
 RUN mkdir -p /run/sshd
 
-# Add Apache2's www-data user to sudo group and enable passwordless startup
-RUN adduser www-data sudo
-COPY ./web/etc-sudoers.d/www-data_startupservice /etc/sudoers.d/www-data_startupservice
-
-# Add Apache2 service startup script
-COPY ./web/startupservice.sh /startupservice.sh
-RUN chmod +x /startupservice.sh
-CMD ["sudo", "--preserve-env", "/startupservice.sh"]
+# Start SSH
+CMD ["/usr/sbin/sshd", "-D"]
 
 # Expose SSH port
 EXPOSE 22
@@ -73,18 +72,5 @@ EXPOSE 22
 EXPOSE 80
 
 # Enable Apache modules
-RUN a2enmod headers
-RUN a2enmod php8.2
 RUN a2enmod rewrite
 
-# Configure PHP
-COPY ./web/etc-php-8.2-apache2-conf.d/90-local.ini /etc/php/8.2/apache2/conf.d/
-
-# Create the wp directory and set permissions
-RUN mkdir -p /usr/local/bin/wp/
-RUN chown -R www-data:www-data /usr/local/bin/wp/
-
-# Create the dev directory and set permissions
-RUN mkdir -p /var/www/dev/wp-content/uploads
-RUN chown -R www-data:www-data /var/www/dev
-
diff --git a/web/startupservice.sh b/web/startupservice.sh
