Skip to content

Commit 080b561

Browse files
rolandosbornerolandosborne
committed
Merge branch 'sdk-container'
2 parents fba0506 + 29de296 commit 080b561

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2419
-8860
lines changed

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ FROM node:22-alpine AS node
22
WORKDIR /app
33

44
# Download the node dependencies first before adding the rest for caching
5-
COPY ./net/web/package.json ./net/web/yarn.lock ./
5+
COPY ./app/client/web/package.json ./app/client/web/yarn.lock ./
66
RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn \
77
yarn --frozen-lockfile
88

9-
COPY ./net/web/ ./
9+
COPY ./app/client/web/ ./
1010
RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn \
1111
yarn run build
1212

@@ -37,7 +37,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
3737
if [ -n "${DATABAG_GOOS}" ]; then GOOS=${DATABAG_GOOS}; fi; \
3838
CGO_ENABLED=1 go build -o databag .
3939

40-
COPY --from=node /app/build /app/databag/net/web/build
40+
COPY --from=node /app/dist /app/databag/net/web/build
4141

4242
ENV DEV=0
4343
ENV ADMIN=password

‎app/client/web/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/src/favicon.ico" />
5+
<link rel="icon" type="image/svg+xml" href="favicon.ico" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<title>Databag</title>
88
</head>

0 commit comments

Comments
 (0)