Merge branch 'main' into feat/ojoi-application-additional-state

apps/services/search-indexer/dev-services/elasticsearch/Dockerfile

@@ -7,7 +7,9 @@ RUN bin/elasticsearch-plugin install analysis-icu
 RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
 RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
 
-RUN yum -y install unzip wget
+# hadolint ignore=DL3033
+RUN yum -y install unzip wget && \
+  yum clean all
 
 # get dictionaries
 RUN wget -O master.zip https://github.com/island-is/elasticsearch-dictionaries/archive/master.zip

infra/scripts/Dockerfile

@@ -1,30 +1,31 @@
 ARG DOCKER_IMAGE_REGISTRY=public.ecr.aws
 ARG NODE_IMAGE_TAG
-FROM ${DOCKER_IMAGE_REGISTRY}/docker/library/node:${NODE_IMAGE_TAG} as runner
+FROM ${DOCKER_IMAGE_REGISTRY}/docker/library/node:${NODE_IMAGE_TAG} AS runner
 
-RUN apk add postgresql-client bash
+# hadolint ignore=DL3018
+RUN apk add --no-cache postgresql-client bash
 
-FROM ${DOCKER_IMAGE_REGISTRY}/docker/library/node:${NODE_IMAGE_TAG} as build
+FROM ${DOCKER_IMAGE_REGISTRY}/docker/library/node:${NODE_IMAGE_TAG} AS build
+WORKDIR /app/infra
 
 ENV NODE_OPTIONS=--openssl-legacy-provider
 
-ADD infra/package.json infra/yarn.lock /app/infra/
+COPY infra/package.json infra/yarn.lock /app/infra/
 COPY .yarn/ ./.yarn
-WORKDIR /app/infra
 RUN yarn install --immutable
 
-ADD infra/ /app/infra/
-ADD apps /app/apps/
-ADD libs /app/libs/
+COPY infra/ /app/infra/
+COPY apps /app/apps/
+COPY libs /app/libs/
 
-RUN ./node_modules/.bin/ncc build src/feature-env.ts -o /app/dist/feature-env
-RUN ./node_modules/.bin/ncc build src/secrets.ts -o /app/dist/secrets
+RUN ./node_modules/.bin/ncc build src/feature-env.ts -o /app/dist/feature-env && \
+  ./node_modules/.bin/ncc build src/secrets.ts -o /app/dist/secrets
 
 FROM runner
+WORKDIR /app
 
 COPY --from=build /app/dist/ /app
-COPY infra/scripts/container-scripts/* ./app/
-COPY infra/scripts/update-package-json.ts ./app/
-WORKDIR /app
+COPY infra/scripts/container-scripts/* /app/
+COPY infra/scripts/update-package-json.ts /app/
 
 ENTRYPOINT [ "node", "feature-env" ]