Skip to content

Commit

Permalink
refactor: move gradle build in dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
manhinhang committed Apr 21, 2024
1 parent 9389082 commit 908c372
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 23 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,6 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
- name: Build healthcheck tool
working-directory: healthcheck
run: ./gradlew build
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/deploy-dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@ jobs:
timeout-minutes: 20
steps:
- uses: actions/checkout@master
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
- name: Build healthcheck tool
working-directory: healthcheck
run: ./gradlew build
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
Expand Down
17 changes: 14 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@ RUN chmod +x ${IBC_PATH}/*.sh ${IBC_PATH}/*/*.sh
# copy IBC/Jts configs
COPY ibc/config.ini ${IBC_INI}

# temp container to build using gradle
FROM gradle:8.7.0-jdk17 AS healthcheck-tools
ENV APP_HOME=/usr/app/
WORKDIR $APP_HOME
COPY healthcheck $APP_HOME

RUN gradle clean build

RUN unzip healthcheck/build/distributions/healthcheck.zip -d $APP_HOME/healthcheck
RUN unzip healthcheck-rest/build/distributions/healthcheck-rest-boot.zip -d $APP_HOME/healthcheck-rest

FROM debian:bookworm-slim
ARG IB_GATEWAY_MAJOR="10"
ARG IB_GATEWAY_MINOR="19"
Expand Down Expand Up @@ -56,7 +67,7 @@ ENV TWS_INSTALL_LOG=/root/Jts/tws_install.log \
IB_GATEWAY_VERSION=${IB_GATEWAY_MAJOR}${IB_GATEWAY_MINOR}

# make dirs
RUN mkdir -p /tmp && mkdir -p ${IBC_PATH} && mkdir -p ${TWS_PATH}
RUN mkdir -p /tmp && mkdir -p ${IBC_PATH} && mkdir -p ${TWS_PATH} && mkdir -p /healthcheck

# download IB TWS
COPY --from=downloader /tmp/ibgw.sh /tmp/ibgw.sh
Expand All @@ -69,10 +80,10 @@ COPY --from=downloader /opt/ibc /opt/ibc
COPY --from=downloader /root/ibc /root/ibc

# install healthcheck tool
ADD healthcheck/healthcheck/build/distributions/healthcheck.tar /
COPY --from=healthcheck-tools /usr/app/healthcheck /healthcheck
ENV PATH="${PATH}:/healthcheck/bin"

ADD healthcheck/healthcheck-rest/build/distributions/healthcheck-rest-boot.tar /
COPY --from=healthcheck-tools /usr/app/healthcheck-rest /healthcheck-rest
ENV PATH="${PATH}:/healthcheck-rest-boot/bin"

# copy cmd script
Expand Down

0 comments on commit 908c372

Please sign in to comment.