Skip to content

Commit

Permalink
updated to openjdk version 11.0.15 2022-04-1; also upgrade Maven, and…
Browse files Browse the repository at this point in the history
… tools version including PIP modules
  • Loading branch information
DrSnowbird authored and DrSnowbird committed May 30, 2022
1 parent aba72db commit bc606ec
Show file tree
Hide file tree
Showing 3 changed files with 105 additions and 117 deletions.
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ ENV PATH=$JAVA_HOME/bin:$PATH
# ------------------
# OpenJDK Java:
# ------------------

ARG OPENJDK_PACKAGE=${OPENJDK_PACKAGE:-openjdk-${JAVA_VERSION}-jdk}

# -- To install JDK Source (src.zip), uncomment the line below: --
Expand Down Expand Up @@ -174,10 +173,13 @@ RUN mkdir -p ${GRADLE_INSTALL_BASE} && \
#### ---- Node from NODESOURCES ---- ####
#########################################
# Ref: https://github.com/nodesource/distributions
ARG NODE_VERSION=${NODE_VERSION:-current}
#ARG NODE_VERSION=${NODE_VERSION:-current}
# Ubuntu 18.04 missing GLC lib 2.28 needed by latest Node v18
# Hence stick to v17
ARG NODE_VERSION=${NODE_VERSION:-17}
ENV NODE_VERSION=${NODE_VERSION}
RUN apt-get update -y && \
curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && \
curl -sL -k https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && \
apt-get install -y nodejs && \
npm install -g npm@latest

Expand Down
209 changes: 98 additions & 111 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,81 +247,66 @@ If you want to map to different directory for certificates, e.g., /home/develope

# Releases information
```
developer@galactica:~$ /usr/scripts/printVersions.sh
+ echo JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
developer@aurora:~$ /usr/scripts/printVersions.sh
JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+ whereis java
java: /usr/bin/java /usr/share/java /usr/lib/jvm/java-11-openjdk-amd64/bin/java /usr/share/man/man1/java.1.gz
+ echo
+ java -version
openjdk version "11.0.11" 2021-04-20
OpenJDK Runtime Environment (build 11.0.11+9-Ubuntu-0ubuntu2.18.04)
OpenJDK 64-Bit Server VM (build 11.0.11+9-Ubuntu-0ubuntu2.18.04, mixed mode, sharing)
+ mvn --version
Apache Maven 3.8.2 (ea98e05a04480131370aa0c110b8c54cf726c06f)
Maven home: /usr/apache-maven-3.8.2
Java version: 11.0.11, vendor: Ubuntu, runtime: /usr/lib/jvm/java-11-openjdk-amd64
/usr/lib/jvm/java-11-openjdk-amd64/bin/java
openjdk version "11.0.15" 2022-04-19
OpenJDK Runtime Environment (build 11.0.15+10-Ubuntu-0ubuntu0.18.04.1)
OpenJDK 64-Bit Server VM (build 11.0.15+10-Ubuntu-0ubuntu0.18.04.1, mixed mode, sharing)
/usr/bin/mvn
Apache Maven 3.8.5 (3599d3414f046de2324203b78ddcf9b5e4388aa0)
Maven home: /usr/apache-maven-3.8.5
Java version: 11.0.15, vendor: Private Build, runtime: /usr/lib/jvm/java-11-openjdk-amd64
Default locale: en, platform encoding: UTF-8
OS name: "linux", version: "5.11.0-34-generic", arch: "amd64", family: "unix"
+ python -V
/usr/bin/python
Python 2.7.17
+ python3 -V
/usr/bin/python3
Python 3.6.9
+ pip --version
pip 21.2.4 from /usr/local/lib/python3.6/dist-packages/pip (python 3.6)
+ pip3 --version
pip 21.2.4 from /usr/local/lib/python3.6/dist-packages/pip (python 3.6)
+ gradle --version
/usr/local/bin/pip
pip 21.3.1 from /usr/local/lib/python3.6/dist-packages/pip (python 3.6)
/usr/local/bin/pip3
pip 21.3.1 from /usr/local/lib/python3.6/dist-packages/pip (python 3.6)
/usr/bin/gradle
Welcome to Gradle 7.1!
Welcome to Gradle 7.4.2!
Here are the highlights of this release:
- Faster incremental Java compilation
- Easier source set configuration in the Kotlin DSL
- Aggregated test and JaCoCo reports
- Marking additional test source directories as tests in IntelliJ
- Support for Adoptium JDKs in Java toolchains
For more details see https://docs.gradle.org/7.1/release-notes.html
For more details see https://docs.gradle.org/7.4.2/release-notes.html
------------------------------------------------------------
Gradle 7.1
Gradle 7.4.2
------------------------------------------------------------
Build time: 2021-06-14 14:47:26 UTC
Revision: 989ccc9952b140ee6ab88870e8a12f1b2998369e
Build time: 2022-03-31 15:25:29 UTC
Revision: 540473b8118064efcc264694cbcaa4b677f61041
Kotlin: 1.4.31
Groovy: 3.0.7
Ant: Apache Ant(TM) version 1.10.9 compiled on September 27 2020
JVM: 11.0.11 (Ubuntu 11.0.11+9-Ubuntu-0ubuntu2.18.04)
Kotlin: 1.5.31
Groovy: 3.0.9
Ant: Apache Ant(TM) version 1.10.11 compiled on July 10 2021
JVM: 11.0.15 (Private Build 11.0.15+10-Ubuntu-0ubuntu0.18.04.1)
OS: Linux 5.11.0-34-generic amd64
+ npm -v
7.23.0
+ node -v
v16.9.0
+ yarn -V
yarn install v1.22.5
warning package.json: No license field
info No lockfile found.
warning package-lock.json found. Your project contains lock files generated by tools other than Yarn. It is advised not to mix package managers in order to avoid resolution inconsistencies caused by unsynchronized lock files. To clear this warning, remove package-lock.json.
warning No license field
[1/4] Resolving packages...
[2/4] Fetching packages...
[3/4] Linking dependencies...
[4/4] Building fresh packages...
success Saved lockfile.
Done in 2.02s.
+ cat /etc/lsb-release /etc/os-release
/usr/bin/npm
8.11.0
/usr/bin/node
v17.9.0
DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=18.04
DISTRIB_CODENAME=bionic
DISTRIB_DESCRIPTION="Ubuntu 18.04.5 LTS"
DISTRIB_DESCRIPTION="Ubuntu 18.04.6 LTS"
NAME="Ubuntu"
VERSION="18.04.5 LTS (Bionic Beaver)"
VERSION="18.04.6 LTS (Bionic Beaver)"
ID=ubuntu
ID_LIKE=debian
PRETTY_NAME="Ubuntu 18.04.5 LTS"
PRETTY_NAME="Ubuntu 18.04.6 LTS"
VERSION_ID="18.04"
HOME_URL="https://www.ubuntu.com/"
SUPPORT_URL="https://help.ubuntu.com/"
Expand All @@ -333,128 +318,130 @@ UBUNTU_CODENAME=bionic

## Python3 PIP Modules
```
developer@galactica:~$ pip freeze
argon2-cffi==21.1.0
developer@aurora:~$ pip freeze
argon2-cffi==21.3.0
argon2-cffi-bindings==21.2.0
asn1crypto==0.24.0
async-generator==1.10
attrs==21.2.0
attrs==21.4.0
backcall==0.2.0
backports.entry-points-selectable==1.1.0
beautifulsoup4==4.6.0
bleach==4.1.0
certifi==2021.5.30
cffi==1.14.6
certifi==2022.5.18.1
cffi==1.15.0
chardet==3.0.4
charset-normalizer==2.0.4
cloudpickle==1.6.0
charset-normalizer==2.0.12
cloudpickle==2.1.0
cryptography==2.1.4
cycler==0.10.0
cycler==0.11.0
dataclasses==0.8
decorator==4.4.2
defusedxml==0.7.1
distlib==0.3.2
entrypoints==0.3
filelock==3.0.12
funcy==1.16
distlib==0.3.4
entrypoints==0.4
filelock==3.4.1
funcy==1.17
future==0.18.2
greenlet==1.1.1
greenlet==1.1.2
html5lib==0.999999999
httpie==2.5.0
hyperopt==0.2.5
idna==3.2
importlib-metadata==4.8.1
importlib-resources==5.2.2
httpie==2.6.0
hyperopt==0.2.7
idna==3.3
importlib-metadata==4.8.3
importlib-resources==5.4.0
ipaddress==1.0.23
ipykernel==5.5.5
ipython==7.16.1
ipykernel==5.5.6
ipython==7.16.3
ipython-genutils==0.2.0
ipywidgets==7.6.4
ipywidgets==7.7.0
j2cli==0.3.10
jedi==0.18.0
Jinja2==3.0.1
joblib==1.0.1
jedi==0.17.2
Jinja2==3.0.3
joblib==1.1.0
json-lines==0.5.0
jsonschema==3.2.0
jupyter==1.0.0
jupyter-client==7.0.2
jupyter-console==6.4.0
jupyter-core==4.7.1
jupyter-client==7.1.2
jupyter-console==6.4.3
jupyter-core==4.9.2
jupyterlab-pygments==0.1.2
jupyterlab-widgets==1.0.1
jupyterlab-widgets==1.1.0
keyring==10.6.0
keyrings.alt==3.0
kiwisolver==1.3.1
lxml==4.2.1
MarkupSafe==2.0.1
matplotlib==3.3.4
mistune==0.8.4
nbclient==0.5.4
nbclient==0.5.9
nbconvert==6.0.7
nbformat==5.1.3
nest-asyncio==1.5.1
nest-asyncio==1.5.5
networkx==2.5.1
notebook==6.4.3
numexpr==2.7.3
notebook==6.4.10
numexpr==2.8.1
numpy==1.19.5
olefile==0.45.1
packaging==21.0
packaging==21.3
panda==0.3.1
pandas==0.24.2
pandasql==0.7.3
pandocfilters==1.4.3
parso==0.8.2
pbr==5.6.0
pandocfilters==1.5.0
parso==0.7.1
pbr==5.9.0
pexpect==4.8.0
pickleshare==0.7.5
Pillow==8.3.2
Pillow==8.4.0
pkgconfig==1.5.5
platformdirs==2.3.0
prometheus-client==0.11.0
prompt-toolkit==3.0.20
platformdirs==2.4.0
prometheus-client==0.14.1
prompt-toolkit==3.0.29
ptyprocess==0.7.0
pycparser==2.20
py4j==0.10.9.5
pycparser==2.21
pycrypto==2.6.1
pydot==1.4.2
Pygments==2.10.0
Pygments==2.12.0
PyGObject==3.26.1
pyLDAvis==3.2.2
pyparsing==2.4.7
pyparsing==3.0.9
pyrsistent==0.18.0
PySocks==1.7.1
python-apt==1.6.5+ubuntu0.6
python-apt==1.6.5+ubuntu0.7
python-dateutil==2.5.2
python-git==2018.2.1
pytz==2021.1
pytz==2022.1
pyxdg==0.25
PyYAML==3.11
pyzmq==22.2.1
qtconsole==5.1.1
QtPy==1.11.0
requests==2.26.0
pyzmq==23.0.0
qtconsole==5.2.2
QtPy==2.0.1
requests==2.27.1
requests-toolbelt==0.9.1
scikit-learn==0.24.2
scipy==1.5.4
seaborn==0.11.2
SecretStorage==2.3.1
Send2Trash==1.8.0
six==1.16.0
SQLAlchemy==1.4.23
stevedore==3.4.0
SQLAlchemy==1.4.36
stevedore==3.5.0
tables==3.4.2
terminado==0.12.1
testpath==0.5.0
threadpoolctl==2.2.0
testpath==0.6.0
threadpoolctl==3.1.0
tornado==6.1
tqdm==4.62.2
tqdm==4.64.0
traitlets==4.3.3
typing-extensions==3.10.0.2
typing_extensions==4.1.1
unattended-upgrades==0.1
urllib3==1.26.6
virtualenv==20.7.2
urllib3==1.26.9
virtualenv==20.14.1
virtualenv-clone==0.5.7
virtualenvwrapper==4.8.4
wcwidth==0.2.5
webencodings==0.5.1
widgetsnbextension==3.5.1
widgetsnbextension==3.6.0
yml2json==1.1.3
zipp==3.5.0
zipp==3.6.0
```
5 changes: 2 additions & 3 deletions scripts/add-user-sudo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fi
USER_NAME=${1:-developer}
USER_PASSWORD=${2}

HOME=/home/${USER_NAME}
USER_HOME=/home/${USER_NAME}

if [ "$USER_PASSWORD" != "" ]; then
sudo groupadd ${USER_NAME}
Expand All @@ -24,8 +24,7 @@ else
sudo groupadd ${USER_NAME} && sudo useradd ${USER_NAME} -m -d ${HOME} -s /bin/bash -g ${USER_NAME}
fi

exit 1

#echo "${USER_NAME} ALL=NOPASSWD:ALL" | sudo tee -a /etc/sudoers
sudo usermod -aG sudo ${USER_NAME}
sudo usermod -aG docker ${USER_NAME}

0 comments on commit bc606ec

Please sign in to comment.