Skip to content

Commit

Permalink
Lint Dockerfile.ci and fix empty line for license comment
Browse files Browse the repository at this point in the history
  • Loading branch information
bugraoz93 committed Nov 18, 2024
1 parent 35193f1 commit 6aed976
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -1271,6 +1271,7 @@ EOF
# The content below is automatically copied from scripts/docker/install_npm_pnpm_yarn.sh
COPY <<"EOF" /install_npm_pnpm_yarn.sh
#!/usr/bin/env bash

. "$( dirname "${BASH_SOURCE[0]}" )/common.sh"

function install_npm_pnpm_yarn() {
Expand Down Expand Up @@ -1518,9 +1519,9 @@ ENV AIRFLOW_PRE_CACHED_YARN_PACKAGES=${AIRFLOW_PRE_CACHED_YARN_PACKAGES}
COPY --from=scripts install_yarn_dependencies_from_branch_tip.sh /scripts/docker/

ENV YARN_CACHE_DIR="${AIRFLOW_SOURCES}/.yarn-cache"
RUN mkdir -p "${YARN_CACHE_DIR}"
# We are installing Yarn dependencies here to make sure they are cached in the layer
RUN if [[ ${AIRFLOW_PRE_CACHED_YARN_PACKAGES} == "true" ]]; then \
RUN mkdir -p "${YARN_CACHE_DIR}" && \
if [[ ${AIRFLOW_PRE_CACHED_YARN_PACKAGES} == "true" ]]; then \
bash /scripts/docker/install_yarn_dependencies_from_branch_tip.sh; \
fi

Expand All @@ -1530,9 +1531,9 @@ ENV AIRFLOW_PRE_CACHED_PNPM_PACKAGES=${AIRFLOW_PRE_CACHED_PNPM_PACKAGES}
COPY --from=scripts install_pnpm_dependencies_from_branch_tip.sh /scripts/docker/

ENV PNPM_CACHE_DIR="${AIRFLOW_SOURCES}/.pnpm-cache"
RUN mkdir -p "${PNPM_CACHE_DIR}"
# We are installing pnpm dependencies here to make sure they are cached in the layer
RUN if [[ ${AIRFLOW_PRE_CACHED_PNPM_PACKAGES} == "true" ]]; then \
RUN mkdir -p "${PNPM_CACHE_DIR}" && \
if [[ ${AIRFLOW_PRE_CACHED_PNPM_PACKAGES} == "true" ]]; then \
bash /scripts/docker/install_pnpm_dependencies_from_branch_tip.sh; \
fi

Expand Down
1 change: 1 addition & 0 deletions scripts/docker/install_npm_pnpm_yarn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# specific language governing permissions and limitations
# under the License.
# shellcheck shell=bash disable=SC2086

# shellcheck source=scripts/docker/common.sh
. "$( dirname "${BASH_SOURCE[0]}" )/common.sh"

Expand Down

0 comments on commit 6aed976

Please sign in to comment.