diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 1b214c65..d22ac621 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -14,28 +14,6 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - name: Set up Node - uses: actions/setup-node@v4 - with: - node-version: 18 - - name: Enable yarn v4 - run: | - corepack enable - yarn -v - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT - - uses: actions/cache@v4 - id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - name: Install - run: yarn install - - name: Build - run: yarn build - name: Build image run: | docker build -t quay.io/hawtio/online:latest . diff --git a/Dockerfile b/Dockerfile index aa8558fe..10ae283f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -76,7 +76,7 @@ COPY docker/hawtio-404.html /usr/share/nginx/html # Copy licenses RUN mkdir -p /opt/hawtio/licenses -COPY docker/licenses /opt/hawtio/licenses +COPY --from=builder /hawtio-online/docker/licenses /opt/hawtio/licenses COPY --from=builder /hawtio-online/packages/online-shell/build /usr/share/nginx/html/online/ COPY --from=envsubst /usr/bin/envsubst /usr/local/bin/