Skip to content

Commit 486dcf5

Browse files
committed
Revert "Deno config"
This reverts commit 1e0c049.
1 parent 47b178f commit 486dcf5

File tree

16 files changed

+170
-1549
lines changed

16 files changed

+170
-1549
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.4
1+
3.2.3

.tool-versions

Lines changed: 0 additions & 1 deletion
This file was deleted.

Dockerfile

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
FROM denoland/deno:2.1.3 AS frontend
1+
FROM oven/bun:1 as frontend
22

33
WORKDIR /app
44

5-
COPY deno.jsonc deno.lock web/deno.jsonc ./web/
6-
RUN deno install
7-
COPY web/vite.config.ts ./web/
8-
COPY web/src ./web/src
9-
COPY web/public ./web/public
10-
COPY web/index.html ./web/index.html
11-
WORKDIR /app/web
12-
RUN deno task build
5+
COPY package.json bun.lockb web/package.json ./
6+
RUN bun install
7+
ENV NODE_ENV=production
8+
COPY web ./web
9+
RUN cd web && bun run build
1310

14-
FROM ruby:3.3.4-slim AS base
11+
FROM ruby:3.2.3-slim as base
1512

1613
LABEL fly_launch_runtime="rails"
1714

@@ -30,7 +27,7 @@ RUN gem update --system --no-document && \
3027

3128

3229
# Throw-away build stage to reduce size of final image
33-
FROM base AS build
30+
FROM base as build
3431

3532
# Install packages needed to build gems
3633
RUN apt-get update -qq && \
@@ -61,8 +58,8 @@ RUN apt-get update -qq && \
6158
COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"
6259
COPY --from=build /rails /rails
6360
RUN mkdir -p /rails/public
64-
COPY --from=frontend /app/web/build/ /rails/public
65-
COPY --from=frontend /app/web/public/ /rails/public
61+
COPY --from=frontend /app/web/build/* /rails/public
62+
COPY --from=frontend /app/web/public/* /rails/public
6663

6764
# Run and own only the runtime files as a non-root user for security
6865
RUN groupadd --system --gid 1000 rails && \

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
ruby "3.3.4"
3+
ruby "3.2.3"
44

55
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
66
gem "rails", "~> 7.1.3"

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ DEPENDENCIES
305305
webauthn (~> 3.1)
306306

307307
RUBY VERSION
308-
ruby 3.3.4p94
308+
ruby 3.2.3p157
309309

310310
BUNDLED WITH
311311
2.5.3

deno.jsonc

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)