Skip to content

Commit

Permalink
Fix docker image workflow failure (#753)
Browse files Browse the repository at this point in the history
  • Loading branch information
robgruen authored Feb 26, 2025
1 parent 04ad5f9 commit 523e7d4
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/build-docker-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,21 @@ on:
push:
branches:
- main
workflow_dispatch:

permissions:
id-token: write
contents: read

env:
#export LD_DEBUG: libs -- for debug logging

jobs:
deploy:
environment: development-fork
runs-on: ubuntu-latest # pnpm deploy does not work currently on Windows. Fails with EPERM.

steps:

- name: Setup Git LF
run: |
git config --global core.autocrlf false
Expand Down Expand Up @@ -58,4 +63,4 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- run: az acr build -t typeagent:latest -r typeagentContainerRegistry --file ${{ github.workspace }}/ts/Dockerfile --subscription b64471de-f2ac-4075-a3cb-7656bca768d0 ${{ github.workspace }}/ts
- run: az acr build -t typeagent:latest -r typeagentContainerRegistry --file ${{ github.workspace }}/ts/Dockerfile --subscription ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_F36C1F2C4B2C49CA8DD5C52FAB98FA30 }} ${{ github.workspace }}/ts
18 changes: 10 additions & 8 deletions ts/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,15 @@ FROM node:20 AS base

ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
RUN npm install -g [email protected]
RUN corepack enable
RUN npm install -g corepack@latest
RUN corepack enable pnpm
RUN corepack install -g pnpm@latest

# dependencies
RUN apt-get update
RUN apt-get install -y libsecret-1-0
RUN apt install -y gnome-keyring
RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash

# Install dependencies required for Chrome/Puppeteer
RUN apt-get update && apt-get install -y \
Expand Down Expand Up @@ -53,11 +60,6 @@ COPY --from=build /prod/tools/ /prod/tools/
COPY --from=build /usr/src/app/packages/shell/out/ /prod/shell/out/
WORKDIR /prod/api

# dependencies
RUN apt-get update
RUN apt install -y gnome-keyring
RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash

######################################### BLOB STORAGE MOUNT #########################################
## blobfuse - https://github.com/Azure/azure-storage-fuse/tree/main
## Uncomment the section below to use blobfuse to mount blob storage
Expand Down Expand Up @@ -87,4 +89,4 @@ RUN echo node ../tools/scripts/getKeys.mjs >> start.sh
RUN echo pnpm start >> start.sh

# run start script
CMD bash start.sh
CMD ["bash", "start.sh"]

0 comments on commit 523e7d4

Please sign in to comment.