Skip to content

Commit

Permalink
fix(ci): fix image build again making docker build independent from y…
Browse files Browse the repository at this point in the history
…arn build
  • Loading branch information
tadayosi committed Mar 7, 2024
1 parent 6124177 commit 104a6fd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 23 deletions.
22 changes: 0 additions & 22 deletions .github/workflows/image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down

0 comments on commit 104a6fd

Please sign in to comment.