Compare commits

...

6 Commits

Author SHA1 Message Date
Ivan Dyachkov 3ebb000166 ci: disable DEBUG in the build script 2024-01-31 10:20:45 +01:00
Ivan Dyachkov 9012ecb39e ci: disable DEBUG and DIAGNOSTIC in Dockerfile harder 2024-01-31 10:19:50 +01:00
Ivan Dyachkov 71925f69eb ci: disable DEBUG and DIAGNOSTIC in Dockerfile 2024-01-31 10:05:39 +01:00
Ivan Dyachkov 1ed47c82a4 ci: disable rebar cache in build script 2024-01-31 09:56:52 +01:00
Ivan Dyachkov 58984bb6cf chore: disable cache in Dockerfile 2024-01-31 09:42:06 +01:00
Ivan Dyachkov d59b1dfd5d ci: build docker images on self-hosted runners 2024-01-31 09:32:41 +01:00
3 changed files with 4 additions and 22 deletions

View File

@ -73,7 +73,7 @@ permissions:
jobs: jobs:
docker: docker:
runs-on: ${{ endsWith(github.repository, '/emqx') && 'ubuntu-22.04' || fromJSON('["self-hosted","ephemeral","linux","x64"]') }} runs-on: ${{ github.repository_owner == 'emqx' && fromJSON('["self-hosted","ephemeral-xl","linux","x64"]') || 'ubuntu-22.04' }}
strategy: strategy:
fail-fast: false fail-fast: false

14
build
View File

@ -6,12 +6,6 @@
set -euo pipefail set -euo pipefail
if [ "${DEBUG:-0}" -eq 1 ]; then
set -x
# set this for rebar3
export DIAGNOSTIC=1
fi
log_red() { log_red() {
local RED='\033[0;31m' # Red local RED='\033[0;31m' # Red
local NC='\033[0m' # No Color local NC='\033[0m' # No Color
@ -467,14 +461,6 @@ make_docker() {
if [ "${DOCKER_PUSH:-false}" = true ]; then if [ "${DOCKER_PUSH:-false}" = true ]; then
DOCKER_BUILDX_ARGS+=(--push) DOCKER_BUILDX_ARGS+=(--push)
fi fi
if [ -d "${REBAR_GIT_CACHE_DIR:-}" ]; then
cache_tar="$(pwd)/rebar-git-cache.tar"
if [ ! -f "${cache_tar}" ]; then
pushd "${REBAR_GIT_CACHE_DIR}" >/dev/null
tar -cf "${cache_tar}" .
popd >/dev/null
fi
fi
if [ -n "${DEBUG:-}" ]; then if [ -n "${DEBUG:-}" ]; then
DOCKER_BUILDX_ARGS+=(--build-arg DEBUG="${DEBUG}" --progress=plain) DOCKER_BUILDX_ARGS+=(--build-arg DEBUG="${DEBUG}" --progress=plain)
fi fi

View File

@ -9,23 +9,19 @@ ARG EMQX_NAME=emqx
ARG PKG_VSN ARG PKG_VSN
ENV EMQX_RELUP=false ENV EMQX_RELUP=false
ENV DEBUG=${DEBUG}
ENV EMQX_REL_FORM='docker' ENV EMQX_REL_FORM='docker'
WORKDIR /emqx/ WORKDIR /emqx/
RUN git config --global --add safe.directory '*' RUN git config --global --add safe.directory '*'
RUN if [ -f rebar-git-cache.tar ]; then \ RUN export REBAR_GIT_CACHE_REF_AUTOFILL=0 \
mkdir .cache && \
tar -xf rebar-git-cache.tar -C .cache && \
export REBAR_GIT_CACHE_DIR='/emqx/.cache' && \
export REBAR_GIT_CACHE_REF_AUTOFILL=0 ;\
fi \
&& export PROFILE=${EMQX_NAME%%-elixir} \ && export PROFILE=${EMQX_NAME%%-elixir} \
&& export EMQX_NAME1="${EMQX_NAME}" \ && export EMQX_NAME1="${EMQX_NAME}" \
&& export EMQX_NAME=${PROFILE} \ && export EMQX_NAME=${PROFILE} \
&& export EMQX_REL_PATH="/emqx/_build/${EMQX_NAME}/rel/emqx" \ && export EMQX_REL_PATH="/emqx/_build/${EMQX_NAME}/rel/emqx" \
&& unset DEBUG \
&& unset DIAGNOSTIC \
&& make ${EMQX_NAME1} \ && make ${EMQX_NAME1} \
&& rm -f ${EMQX_REL_PATH}/*.tar.gz \ && rm -f ${EMQX_REL_PATH}/*.tar.gz \
&& mkdir -p /emqx-rel \ && mkdir -p /emqx-rel \