Skip to content

Commit

Permalink
up
Browse files Browse the repository at this point in the history
  • Loading branch information
mayel committed Oct 20, 2024
1 parent 2d11f39 commit 5276795
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
8 changes: 5 additions & 3 deletions Dockerfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ COPY --link mix.lock ./
# COPY --link data/current_flavour/config/deps*hex ./config/
# COPY --parents --link flavours/*/config/deps*hex ./

# Optionally include local forks
COPY --link data/current_flavour/config/deps*path ./config/
RUN if [ "$FORKS_TO_COPY_PATH" = "data/null" ] ; then rm ./config/deps*path && rm ./flavours/*/config/deps*path ; else echo "Include locally forked extensions." ; fi
COPY --link ${FORKS_TO_COPY_PATH} ./${FORKS_TO_COPY_PATH}

# RUN mix deps.get --only prod
RUN HEX_HTTP_CONCURRENCY=1 HEX_HTTP_TIMEOUT=120 mix deps.get --only prod

Expand Down Expand Up @@ -76,9 +81,6 @@ RUN ls -la config/* && ls flavours/*/config/*
# we need config before compiling Bonfire extensions
COPY --link data/current_flavour/config/ ./config/

# Optionally include local forks
RUN if [ "$FORKS_TO_COPY_PATH" = "data/null" ] ; then rm ./config/deps*path && rm ./flavours/*/config/deps*path ; else echo "Include locally forked extensions." ; fi
COPY --link ${FORKS_TO_COPY_PATH} ./${FORKS_TO_COPY_PATH}

# Update Bonfire extensions to latest git version (mostly useful in CI, and temporary: eventually we want to rely on version numbers and lockfile)
# RUN mix bonfire.deps.update
Expand Down
4 changes: 2 additions & 2 deletions deps-alpine-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
chmod +x ./deps-alpine.sh
./deps-alpine.sh

apk add --update --no-cache just elixir tar file mailcap make build-base gcc libc-dev rust cargo sqlite npm yarn

apk add --update --no-cache just elixir tar file mailcap make build-base libc-dev sqlite npm yarn
# rust cargo gcc
5 changes: 3 additions & 2 deletions deps-debian-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ chmod +x ./deps-debian.sh
./deps-debian.sh

# dev deps
apt-get install -q -y --no-install-recommends gcc sqlite3 npm rustc cargo
apt-get install -q -y --no-install-recommends sqlite3 npm
# rustc cargo gcc g++ make

# deps of tools
apt-get install -q -y --no-install-recommends autoconf dpkg-dev gcc g++ make libncurses-dev unixodbc-dev libssl-dev libsctp-dev libodbc1 libssl1.1 libsctp1
apt-get install -q -y --no-install-recommends autoconf dpkg-dev libncurses-dev unixodbc-dev libssl-dev libsctp-dev libodbc1 libssl1.1 libsctp1

# tools
# NOTE: using mise because bullseye elixir version is too old
Expand Down
1 change: 0 additions & 1 deletion flavours/classic/config/bonfire_ui.exs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ More details at https://bonfirenetworks.org",
title: true,
summary: true
],
invites_component: Bonfire.Invite.Links.Web.InvitesLive,
# smart_input_activities: [
# post: "Compose a post",
# category: "Create a topic",
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ defmodule Bonfire.Umbrella.MixProject do
# TODO: put these in ENV or an external writeable config file similar to deps.*
@config [
# note that the flavour will automatically be added where the dash appears
version: "0.9.10-beta.160",
version: "0.9.10-beta.161",
elixir: ">= #{System.get_env("ELIXIR_VERSION", "1.13.4")}",
flavour: @flavour,
default_flavour: @default_flavour,
Expand Down
2 changes: 1 addition & 1 deletion mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"bonfire_ui_reflow": {:git, "https://github.com/bonfire-networks/bonfire_ui_reflow", "49d0af5ece32f8784055cbb0d554329974098ca7", []},
"bonfire_ui_social": {:git, "https://github.com/bonfire-networks/bonfire_ui_social", "e856d5961130df89e3dfb7d22f493fced73a4d1d", []},
"bonfire_ui_social_graph": {:git, "https://github.com/bonfire-networks/bonfire_ui_social_graph", "fc5b8413860e94b7022acd72321fefeaf7d89b3e", []},
"bonfire_ui_topics": {:git, "https://github.com/bonfire-networks/bonfire_ui_topics", "fbb4465236e03f758792fd61324e143b463697f5", []},
"bonfire_ui_topics": {:git, "https://github.com/bonfire-networks/bonfire_ui_topics", "9626bd864ff9eddb8dc3f9c122a6f6e53a9f65b4", []},
"bonfire_ui_valueflows": {:git, "https://github.com/bonfire-networks/bonfire_ui_valueflows", "a21c1f783ceed3480885f986f73b4da066b67167", []},
"bonfire_upcycle": {:git, "https://gitlab.com/bonfire-networks/bonfire_upcycle", "0291f440af67fe8a67f477dcc904f090ddcdc1f4", []},
"bonfire_valueflows": {:git, "https://github.com/bonfire-networks/bonfire_valueflows", "46f98001a55c2a92fde63da18887ade55f8e17c5", []},
Expand Down

0 comments on commit 5276795

Please sign in to comment.