diff --git a/freqtrade-NFIx5/Dockerfile b/freqtrade-NFIx5/Dockerfile index 44fa707..e75a308 100644 --- a/freqtrade-NFIx5/Dockerfile +++ b/freqtrade-NFIx5/Dockerfile @@ -85,20 +85,20 @@ RUN pip install --upgrade pip setuptools wheel setuptools_scm cython WORKDIR /freq # Clone the Freqtrade repository -RUN git clone https://github.com/freqtrade/freqtrade.git /freq +RUN git clone https://github.com/freqtrade/freqtrade.git /freqtrade # Optionally, switch to the stable branch for novice users ARG FREQTRADE_BRANCH=stable RUN git checkout ${FREQTRADE_BRANCH} # Install Ta-lib RUN chmod +x ./build_helpers/install_ta-lib.sh -WORKDIR /freq/build_helpers +WORKDIR /freqtrade/build_helpers RUN ./install_ta-lib.sh -WORKDIR /freq +WORKDIR /freqtrade RUN python3 -m venv .venv -RUN echo "source /freq/.venv/bin/activate" >> ~/.bashrc -RUN source /freq/.venv/bin/activate +RUN echo "source /freqtrade/.venv/bin/activate" >> ~/.bashrc +RUN source /freqtrade/.venv/bin/activate RUN python3 -m pip install -r requirements.txt @@ -106,10 +106,10 @@ RUN python3 -m pip install -r requirements.txt RUN python3 -m pip install -e . # Activate the virtual environment (implicitly handled in entrypoint or CMD) -RUN echo "source /freq/.venv/bin/activate" >> ~/.bashrc +RUN echo "source /freqtrade/.venv/bin/activate" >> ~/.bashrc -RUN pip install --user --no-cache-dir --no-build-isolation -r /freqtrade/tests/requirements.txt +RUN pip install --user --no-cache-dir --no-build-isolation -r /share/fqm_bot_nfix5/tests/requirements.txt RUN chmod +x /etc/s6-overlay/s6-rc.d/fqmbotnfix5/* diff --git a/freqtrade-NFIx5/config.yaml b/freqtrade-NFIx5/config.yaml index 9fd1651..023d756 100644 --- a/freqtrade-NFIx5/config.yaml +++ b/freqtrade-NFIx5/config.yaml @@ -17,10 +17,6 @@ host_network: true host_pid: true map: - share:rw - - /var/run/docker.sock:/var/run/docker.sock:rw - - /share/fqm_bot_nfix5/user_data:/freqtrade/user_data - - /share/fqm_bot_nfix5/user_data/data:/freqtrade/user_data/data - - /share/fqm_bot_nfix5/configs:/freqtrade/configs ports: 8989/tcp: 8989 options: diff --git a/freqtrade-NFIx5/rootfs/etc/s6-overlay/s6-rc.d/fqmbotnfix5/run b/freqtrade-NFIx5/rootfs/etc/s6-overlay/s6-rc.d/fqmbotnfix5/run index 5ec5b0f..56a343d 100644 --- a/freqtrade-NFIx5/rootfs/etc/s6-overlay/s6-rc.d/fqmbotnfix5/run +++ b/freqtrade-NFIx5/rootfs/etc/s6-overlay/s6-rc.d/fqmbotnfix5/run @@ -53,4 +53,4 @@ export "FREQTRADE__STRATEGY=$(bashio::config 'strategy')" bashio::log.info "starting the bot ..." -exec /freqtrade/.venv/bin/freqtrade trade --db-url sqlite:////freqtrade/user_data/${FREQTRADE__BOT_NAME:-Example_Test_Account}_${FREQTRADE__EXCHANGE__NAME:-binance}_${FREQTRADE__TRADING_MODE:-spot}-tradesv3.sqlite --log-file /freqtrade/user_data/logs/${FREQTRADE__BOT_NAME:-Example_Test_Account}-${FREQTRADE__EXCHANGE__NAME:-binance}-${FREQTRADE__STRATEGY:-NostalgiaForInfinityX5}-${FREQTRADE__TRADING_MODE:-spot}.log \ No newline at end of file +exec /freqtrade/.venv/bin/freqtrade trade --db-url sqlite:////share/fqm_bot_nfix5/user_data/${FREQTRADE__BOT_NAME:-Example_Test_Account}_${FREQTRADE__EXCHANGE__NAME:-binance}_${FREQTRADE__TRADING_MODE:-spot}-tradesv3.sqlite --log-file /share/fqm_bot_nfix5/user_data/logs/${FREQTRADE__BOT_NAME:-Example_Test_Account}-${FREQTRADE__EXCHANGE__NAME:-binance}-${FREQTRADE__STRATEGY:-NostalgiaForInfinityX5}-${FREQTRADE__TRADING_MODE:-spot}.log \ No newline at end of file