Skip to content

Commit 99977af

Browse files
fix: Add version to docker file and remove environment from workflows
1 parent cabccdd commit 99977af

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

.github/workflows/scripts/register_flows.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -242,23 +242,19 @@ def prepare_flows(flows: "List[FlowLike]") -> None:
242242
for flow in flows:
243243
if isinstance(flow, dict):
244244
# Add any extra labels to the flow
245-
if flow.get("environment"):
246-
new_labels = set(flow["environment"].get("labels") or []).union(labels)
247-
flow["environment"]["labels"] = sorted(new_labels)
248-
else:
249-
new_labels = set(flow["run_config"].get("labels") or []).union(labels)
250-
flow["run_config"]["labels"] = sorted(new_labels)
245+
new_labels = set(flow["run_config"].get("labels") or []).union(labels)
246+
flow["run_config"]["labels"] = sorted(new_labels)
251247
else:
252248
# Set the default flow result if not specified
253249
if not flow.result:
254250
flow.result = flow.storage.result
255251

256252
# Add a `run_config` if not configured explicitly
257-
if flow.run_config is None and flow.environment is None:
253+
if flow.run_config is None:
258254
flow.run_config = UniversalRun()
259255
# Add any extra labels to the flow (either specified via the CLI,
260256
# or from the storage object).
261-
obj = flow.run_config or flow.environment
257+
obj = flow.run_config
262258
obj.labels.update(labels)
263259
obj.labels.update(flow.storage.labels)
264260

Dockerfile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,20 @@ FROM python:${PYTHON_VERSION} as base
66

77
# Install git and other dependencies
88
# hadolint ignore=DL3008
9+
# Install git and other dependencies
910
RUN apt-get update && \
1011
apt-get install -y --no-install-recommends \
11-
git \
12-
ffmpeg \
13-
libsm6 \
14-
libxext6 && \
12+
ffmpeg=7:4.1.11-0+deb10u1 \
13+
git=1:2.20.1-2+deb10u9 \
14+
libsm6=2:1.2.3-1 \
15+
libxext6=2:1.3.3-1+b2 && \
1516
apt-get clean && \
1617
rm -rf /var/lib/apt/lists/*
1718

19+
# Setting environment variables for libgdal
20+
ENV CPLUS_INCLUDE_PATH /usr/include/gdal
21+
ENV C_INCLUDE_PATH=/usr/include/gdal
22+
1823
# Setting environment with prefect version
1924
ARG PREFECT_VERSION=1.4.1
2025
ENV PREFECT_VERSION $PREFECT_VERSION

pipelines/bot_semaforo/flows.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,4 @@
4141
image=constants.DOCKER_IMAGE.value,
4242
labels=[constants.RJ_COR_AGENT_LABEL.value],
4343
)
44-
cet_telegram_flow.schedule = bot_schedule
45-
46-
47-
x = 2
44+
cet_telegram_flow.schedule = bot_schedule

0 commit comments

Comments
 (0)