diff --git a/compose.yaml b/compose.yaml index dc38087a9..164bde8c7 100644 --- a/compose.yaml +++ b/compose.yaml @@ -86,7 +86,7 @@ services: memory: "${SPARKD__MEMORY:-4gb}" sparkd-tail: - image: bluetradingsystems/linux_dotnet7 + image: bluetradingsystems/linux_dotnet8 volumes: - type: volume read_only: true @@ -104,7 +104,7 @@ services: build: context: . dockerfile_inline: | - FROM bluetradingsystems/linux_dotnet7 + FROM bluetradingsystems/linux_dotnet8 USER "root" RUN apt-get update && apt-get -y install iputils-ping command: [ "ping", "sparkd" ] diff --git a/docker/images/bluetradingsystems/linux_dotnet8/Dockerfile b/docker/images/bluetradingsystems/linux_dotnet8/Dockerfile new file mode 100644 index 000000000..70d1be024 --- /dev/null +++ b/docker/images/bluetradingsystems/linux_dotnet8/Dockerfile @@ -0,0 +1,38 @@ +FROM ubuntu:22.04 + +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update && apt-get install -y pkg-config +RUN apt-get update && apt-get install -y locales +RUN apt-get update && apt-get install -y ca-certificates +RUN apt-get update && apt-get install -y libssh2-1-dev +RUN apt-get update && apt-get install -y software-properties-common +RUN apt-get update && apt-get install -y sudo + +# GCC +ARG gcc_major=13 +RUN add-apt-repository ppa:ubuntu-toolchain-r/test \ + && apt-get update \ + && apt-get install -y g++-$gcc_major + +RUN apt-get update \ + && apt-get install -y dotnet8 + +RUN locale-gen en_US.UTF-8 + +ARG docker_user="bts" +ARG docker_uid="1000" +ARG docker_pass="bts" + +RUN \ + groupadd -g "$docker_uid" "$docker_user" \ + && useradd \ + -m \ + -u "$docker_uid" \ + -g "$docker_uid" \ + -G sudo \ + --password "$(openssl passwd -1 "$docker_pass")" \ + "$docker_user" + +USER bts +WORKDIR /home/bts diff --git a/src/DataStreamSuite/DataStreamPublisher/Dockerfile b/src/DataStreamSuite/DataStreamPublisher/Dockerfile index ffb5117ce..8a5929e04 100644 --- a/src/DataStreamSuite/DataStreamPublisher/Dockerfile +++ b/src/DataStreamSuite/DataStreamPublisher/Dockerfile @@ -1,4 +1,4 @@ -FROM bluetradingsystems/linux_dotnet7 +FROM bluetradingsystems/linux_dotnet8 ARG CONFIG_DIR="src/DataStreamSuite/DataStreamPublisher/Configurations/Development" ARG SOURCE_DIR="build/Release/bin/net8.0/linux-x64/publish" diff --git a/src/DataStreamSuite/PubSubServer/Dockerfile b/src/DataStreamSuite/PubSubServer/Dockerfile index f97be6b26..47dc3d62b 100644 --- a/src/DataStreamSuite/PubSubServer/Dockerfile +++ b/src/DataStreamSuite/PubSubServer/Dockerfile @@ -1,4 +1,4 @@ -FROM bluetradingsystems/linux_dotnet7 +FROM bluetradingsystems/linux_dotnet8 ARG CONFIG_DIR="src/DataStreamSuite/PubSubServer/Configurations/Development" ARG SOURCE_DIR="build/Release/bin/net8.0/linux-x64/publish" diff --git a/src/app_sparkd/Dockerfile b/src/app_sparkd/Dockerfile index 77c34e631..7fc7cefa9 100644 --- a/src/app_sparkd/Dockerfile +++ b/src/app_sparkd/Dockerfile @@ -4,7 +4,7 @@ ARG SOURCE_DIR="install/sparkd-release-gcc" ARG PYTHON_REQUIREMENTS="requirements.txt" # sparkd_base -FROM bluetradingsystems/linux_dotnet7 AS sparkd_base +FROM bluetradingsystems/linux_dotnet8 AS sparkd_base ARG CONFIG_DIR ARG SOURCE_DIR ARG PYTHON_REQUIREMENTS @@ -32,7 +32,7 @@ ARG MD_RECORDING_DIR="src/app_sparkd/.md_recording" COPY --chown=bts:bts "${MD_RECORDING_DIR}" "/home/bts/sparkdata/data/md_recording" # sparkd_symbols - like sparkd, but doesn't copy a config dir into the image -FROM bluetradingsystems/linux_dotnet7 AS sparkd_symbols +FROM bluetradingsystems/linux_dotnet8 AS sparkd_symbols ARG SOURCE_DIR ARG PYTHON_REQUIREMENTS="requirements.txt" diff --git a/src/client/spark_api_server/Dockerfile b/src/client/spark_api_server/Dockerfile index 87210b36c..e6ecbeab1 100644 --- a/src/client/spark_api_server/Dockerfile +++ b/src/client/spark_api_server/Dockerfile @@ -1,4 +1,4 @@ -FROM bluetradingsystems/linux_dotnet7 +FROM bluetradingsystems/linux_dotnet8 ARG SOURCE_DIR="build/Release/bin/net8.0/linux-x64/publish" ARG CONF_FILE="src/client/spark_api_server/spark.conf"