Explorar o código

:wrench: upgrade nvm & php

Jeremy Zheng hai 1 ano
pai
achega
cb42c7f859
Modificáronse 3 ficheiros con 18 adicións e 16 borrados
  1. 2 13
      docker/mint/Dockerfile
  2. 15 2
      docker/mint/README.md
  3. 1 1
      docker/mint/build.sh

+ 2 - 13
docker/mint/Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:latest
 LABEL maintainer="Jeremy Zheng"
 
 ENV DEBIAN_FRONTEND noninteractive
-ARG PHP_VERSION=8.3
+ARG PHP_VERSION=8.4
 
 RUN apt update
 RUN apt -y install lsb-release apt-utils \
@@ -41,7 +41,7 @@ RUN wget -q -O $HOME/downloads/composer https://getcomposer.org/installer
 RUN cd $HOME/downloads && php${PHP_VERSION} composer && cp composer.phar /usr/local/bin/composer
 
 # https://github.com/nvm-sh/nvm
-ENV NVM_VERSION "v0.40.1"
+ENV NVM_VERSION "v0.40.2"
 RUN git clone -b ${NVM_VERSION} https://github.com/nvm-sh/nvm.git $HOME/.nvm
 RUN echo 'export NVM_DIR="$HOME/.nvm"' >> $HOME/.bashrc
 RUN echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $HOME/.bashrc
@@ -49,17 +49,6 @@ RUN echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"' >>
 RUN bash -i -c "nvm install --lts"
 RUN bash -i -c "npm install -g yarn"
 
-# https://pip.pypa.io/en/stable/installation/
-RUN sh -c ". $HOME/.profile \
-    && python3 -m venv $HOME/local/python3 \
-    && . $HOME/local/python3/bin/activate \
-    && pip install --upgrade pip \
-    && pip install ansible paramiko"
-RUN echo 'export ANSIBLE_HOST_KEY_CHECKING=False' >> $HOME/.profile
-RUN echo 'alias peony="ANSIBLE_LOG_PATH=$HOME/tmp/$(date +%Y%m%d%H%M%S).log ansible-playbook"' >> $HOME/.profile
-RUN echo 'source $HOME/local/python3/bin/activate' >> $HOME/.zshrc
-
-ADD launch.sh /mint.sh
 RUN echo "$(date -u +%4Y%m%d%H%M%S)" | tee /VERSION
 
 VOLUME /srv

+ 15 - 2
docker/mint/README.md

@@ -1,6 +1,19 @@
 # USAGE
 
+## Usage
+
 ```bash
-cd ~/workspace/mint
-./docker/run.sh 8.1 fpm
+cd ~/workspace/mint/docker
+./build.sh PHP_VERSION
 ```
+
+- Laravel & PHP compatibility
+
+| Laravel | PHP       | Security Fixes Until |
+| ------- | --------- | -------------------- |
+| 8       | 7.3 - 8.1 | Jan, 2023            |
+| 12      | 8.2 - 8.4 | Feb, 2027            |
+
+## Documents
+
+- [Laravel Release Notes](https://laravel.com/docs/releases)

+ 1 - 1
docker/mint/build.sh

@@ -10,7 +10,7 @@ fi
 
 export VERSION=$(date "+%4Y%m%d%H%M%S")
 export CODE="mint-php$1"
-export TAR="$CODE-$(uname -m)"
+export TAR="$CODE-$(uname -m)-$VERSION"
 
 podman pull ubuntu:latest
 podman build --build-arg PHP_VERSION=$1 -t $CODE .