Skip to content

Commit

Permalink
Change (#31): update docker-build process
Browse files Browse the repository at this point in the history
  • Loading branch information
kitsudaiki committed Feb 4, 2023
1 parent 4438972 commit 9c42119
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 74 deletions.
18 changes: 1 addition & 17 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,9 @@
# get current directory-path and the path of the parent-directory
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
PARENT_DIR="$(dirname "$DIR")"
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)

# create build-directory
BUILD_DIR="$PARENT_DIR/build"
mkdir -p $BUILD_DIR

# create directory for the final result
RESULT_DIR="$PARENT_DIR/result"
mkdir -p $RESULT_DIR

#-----------------------------------------------------------------------------------------------------------------

# create build directory for Hanami-AI and go into this directory
LIB_HANAMI_DIR="$BUILD_DIR/Hanami-AI"
mkdir -p $LIB_HANAMI_DIR
cd $LIB_KITSUNE_HANAMI_DIR

# build Hanami-AI library with qmake
/usr/lib/x86_64-linux-gnu/qt5/bin/qmake "$PARENT_DIR/Hanami-AI/Hanami-AI.pro" -spec linux-g++ "CONFIG += optimize_full"
/usr/lib/x86_64-linux-gnu/qt5/bin/qmake "$PARENT_DIR/Hanami-AI/Hanami-AI.pro" -spec linux-g++ "CONFIG += optimize_full staticlib"

# IMPORTNANT: at the moment it has to be build with only 1 thread, because the parser-generation with bison and flex
# has problems in a parallel build-process (see issue #30)
Expand Down
6 changes: 3 additions & 3 deletions build/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
FROM ubuntu:22.04

RUN apt-get update && apt-get upgrade -y && apt-get update
RUN apt-get install -y gcc g++ make qt5-qmake bison flex xxd git ssh libssl-dev libcrypto++-dev libboost1.74-dev uuid-dev libsqlite3-dev protobuf-compiler protobuf-compiler nano
RUN apt-get update
RUN apt-get install -y gcc g++ make qt5-qmake bison flex xxd git ssh libssl-dev libcrypto++-dev libboost1.74-dev uuid-dev libsqlite3-dev protobuf-compiler protobuf-compiler nano ocl-icd-opencl-dev opencl-headers
RUN apt-get install -y apt-transport-https ca-certificates curl software-properties-common && \
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \
apt-get update && \
apt-get install -y docker-ce

RUN mkdir /dockerbuilder
COPY files/build.sh /dockerbuilder
COPY files/build_components.sh /dockerbuilder
COPY files/Dockerfile_base /dockerbuilder
COPY files/Dockerfile_kyouko /dockerbuilder
COPY files/Dockerfile_misaki /dockerbuilder
Expand Down
2 changes: 1 addition & 1 deletion build/docker/files/Dockerfile_base
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ FROM ubuntu:22.04
ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update; \
apt-get install -y openssl libuuid1 libcrypto++8 libsqlite3-0 libprotobuf23 libboost1.74 rst2pdf;
apt-get install -y openssl libuuid1 libcrypto++8 libsqlite3-0 libprotobuf23 libboost1.74 rst2pdf opencl-headers ocl-icd-libopencl1;

53 changes: 0 additions & 53 deletions build/docker/files/build.sh

This file was deleted.

0 comments on commit 9c42119

Please sign in to comment.