diff --git a/README.md b/README.md index 91691d1..375d5e2 100644 --- a/README.md +++ b/README.md @@ -21,25 +21,8 @@ docker run --rm -it -v ${pwd}:/toolbox ghcr.io/compose-generator/compose-generat Please note, that this Docker image is based on Linux Alpine and only supports a limited number of commands. So check if your command is supported in the list below. ## Included Linux commands -- bash -- cargo -- create-react-app -- curl -- django-admin -- dotnet (not for armv6, armv7, arm64) -- git -- go (not for i386) -- make -- ng -- npm -- pip -- python / python3 -- rails -- ruby -- rustup -- sh -- unzip -- vue -- yarn + +`bash`, `cargo`, `create-react-app`, `curl`, `django-admin`, `dotnet` (not for armv6, armv7, arm64), `git`, `go` (not for i386), `make`, `ng`, `npm`, +`pip`, `python`, `python3`, `rails`, `rustup`, `sh`, `unzip`, `vue`, `yarn` © Marc Auberer 2021 \ No newline at end of file diff --git a/amd64/Dockerfile b/amd64/Dockerfile index e2c2728..9262db8 100644 --- a/amd64/Dockerfile +++ b/amd64/Dockerfile @@ -10,15 +10,15 @@ RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.8-r0 curl=7.80.0- RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app express-generator && yarn cache clean --all # Install pip dependencies -RUN pip3 install --no-cache-dir flask-now==0.2.2 django==3.2.9 +RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0 # Install gem packages RUN gem install rails:6.1.4.1 && gem cleanup # Install golang -RUN apk add --no-cache --virtual .build-deps gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 go=1.17.3-r0 openssl=1.1.1l-r7 \ +RUN apk add --no-cache --virtual .build-deps gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 go=1.17.4-r0 openssl=1.1.1l-r7 \ && rm -rf /var/cache/apk/* \ - && curl -sSL -o go.tar.gz https://golang.org/dl/go1.17.3.src.tar.gz \ + && curl -sSL -o go.tar.gz https://golang.org/dl/go1.17.4.src.tar.gz \ && tar -C /usr/local -xzf go.tar.gz && rm go.tar.gz WORKDIR /usr/local/go/src/ RUN ./make.bash && apk del .build-deps diff --git a/arm64/Dockerfile b/arm64/Dockerfile index 49996c9..eed0013 100644 --- a/arm64/Dockerfile +++ b/arm64/Dockerfile @@ -10,15 +10,15 @@ RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.8-r0 curl=7.80.0- RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app express-generator && yarn cache clean --all # Install pip dependencies -RUN pip3 install --no-cache-dir flask-now==0.2.2 django==3.2.9 +RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0 # Install gem packages RUN gem install rails:6.1.4.1 && gem cleanup # Install golang -RUN apk add --no-cache --virtual .build-deps gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 go=1.17.3-r0 openssl=1.1.1l-r7 \ +RUN apk add --no-cache --virtual .build-deps gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 go=1.17.4-r0 openssl=1.1.1l-r7 \ && rm -rf /var/cache/apk/* \ - && curl -sSL -o go.tar.gz https://golang.org/dl/go1.17.3.src.tar.gz \ + && curl -sSL -o go.tar.gz https://golang.org/dl/go1.17.4.src.tar.gz \ && tar -C /usr/local -xzf go.tar.gz && rm go.tar.gz WORKDIR /usr/local/go/src/ RUN ./make.bash && apk del .build-deps diff --git a/armv6/Dockerfile b/armv6/Dockerfile index 49996c9..eed0013 100644 --- a/armv6/Dockerfile +++ b/armv6/Dockerfile @@ -10,15 +10,15 @@ RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.8-r0 curl=7.80.0- RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app express-generator && yarn cache clean --all # Install pip dependencies -RUN pip3 install --no-cache-dir flask-now==0.2.2 django==3.2.9 +RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0 # Install gem packages RUN gem install rails:6.1.4.1 && gem cleanup # Install golang -RUN apk add --no-cache --virtual .build-deps gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 go=1.17.3-r0 openssl=1.1.1l-r7 \ +RUN apk add --no-cache --virtual .build-deps gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 go=1.17.4-r0 openssl=1.1.1l-r7 \ && rm -rf /var/cache/apk/* \ - && curl -sSL -o go.tar.gz https://golang.org/dl/go1.17.3.src.tar.gz \ + && curl -sSL -o go.tar.gz https://golang.org/dl/go1.17.4.src.tar.gz \ && tar -C /usr/local -xzf go.tar.gz && rm go.tar.gz WORKDIR /usr/local/go/src/ RUN ./make.bash && apk del .build-deps diff --git a/armv7/Dockerfile b/armv7/Dockerfile index 49996c9..eed0013 100644 --- a/armv7/Dockerfile +++ b/armv7/Dockerfile @@ -10,15 +10,15 @@ RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.8-r0 curl=7.80.0- RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app express-generator && yarn cache clean --all # Install pip dependencies -RUN pip3 install --no-cache-dir flask-now==0.2.2 django==3.2.9 +RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0 # Install gem packages RUN gem install rails:6.1.4.1 && gem cleanup # Install golang -RUN apk add --no-cache --virtual .build-deps gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 go=1.17.3-r0 openssl=1.1.1l-r7 \ +RUN apk add --no-cache --virtual .build-deps gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 go=1.17.4-r0 openssl=1.1.1l-r7 \ && rm -rf /var/cache/apk/* \ - && curl -sSL -o go.tar.gz https://golang.org/dl/go1.17.3.src.tar.gz \ + && curl -sSL -o go.tar.gz https://golang.org/dl/go1.17.4.src.tar.gz \ && tar -C /usr/local -xzf go.tar.gz && rm go.tar.gz WORKDIR /usr/local/go/src/ RUN ./make.bash && apk del .build-deps diff --git a/i386/Dockerfile b/i386/Dockerfile index 1f97ecb..8a820bd 100644 --- a/i386/Dockerfile +++ b/i386/Dockerfile @@ -10,7 +10,7 @@ RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.8-r0 curl=7.80.0- RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app express-generator && yarn cache clean --all # Install pip dependencies -RUN pip3 install --no-cache-dir flask-now==0.2.2 django==3.2.9 +RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0 # Install gem packages RUN gem install rails:6.1.4.1 && gem cleanup