Forked from dark-next dockerfile repo

Author: StachuDotNet

.circleci/config.yml

@@ -5,17 +5,15 @@ jobs:
     machine:
       image: ubuntu-2204:current
     environment:
-      TAG: darklang/dark-base
+      TAG: darklang/dark-classic-base
     steps:
       - checkout
       - run: echo "Building images for version $(./tag-version.sh)."
-      - run: docker buildx build --target dark-base -t $TAG:$(./tag-version.sh) .
+      - run: docker buildx build --target dark-classic-base -t $TAG:$(./tag-version.sh) .
       - deploy:
           name: Push image
           command: |
             if [ "${CIRCLE_BRANCH}" == "main" ]; then
-              docker login --username pbiggar --password "${DOCKER_HUB_TOKEN}"
+              echo "${DOCKER_HUB_TOKEN}" | docker login --username stachudotnet --password-stdin
               docker push $TAG:$(./tag-version.sh)
             fi
-
-

Dockerfile

@@ -19,9 +19,9 @@
 # change.
 
 
-FROM ubuntu:22.04 as dark-base
+FROM ubuntu:22.04 AS dark-classic-base
 
-ENV FORCE_BUILD 3
+ENV FORCE_BUILD=9
 
 # Creates variables to allow builds to work on both amd64 and arm64
 ARG TARGETARCH
@@ -175,9 +175,9 @@ RUN mkdir -p bin
 # Locales
 ############################
 RUN sudo locale-gen "en_US.UTF-8"
-ENV LANGUAGE en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LC_ALL en_US.UTF-8
+ENV LANGUAGE=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
 
 ############################
 # Frontend
@@ -367,7 +367,7 @@ RUN sudo pip3 install -U --no-cache-dir -U crcmod \
 # Pip packages
 ############################
 RUN sudo pip3 install --no-cache-dir yq yamllint watchfiles yapf==0.32.0
-ENV PATH "$PATH:/home/dark/.local/bin"
+ENV PATH="$PATH:/home/dark/.local/bin"
 
 ####################################
 # CircleCI
@@ -472,7 +472,7 @@ RUN sudo dotnet workload install wasm-tools
 
 # formatting
 RUN dotnet tool install fantomas-tool --version 4.7.9 -g
-ENV PATH "$PATH:/home/dark/bin:/home/dark/.dotnet/tools"
+ENV PATH="$PATH:/home/dark/bin:/home/dark/.dotnet/tools"
 
 #############
 # tunnel user

README.md

@@ -1,9 +1,10 @@
-# dockerfile
+# classic-dockerfile
+
 Build our docker container
 
 # Purpose
 
-As a first step to our build in darklang/dark, we need to build the container,
+As a first step to our build in darklang-classic, we need to build the container,
 and save it for future steps by pushing it to a repo. However, we do not want
 to share the keys to push to the docker container publicly (obviously). The
 solution was making a separate repo and not sharing the keys from it.
@@ -14,6 +15,9 @@ If you update this repo and push, the tag(s) will be automatically derived from
 the current git hash - see `tag-version.sh`.
 
 To use in CI, you'll then go to the darklang/dark repo's `.circleci/config.yaml`
-and update `.executors | .[] | .docker.image` for the `in-container` 
-executor.
+and update `.executors.in-container.docker[0].image`
+
+The `./build` script is included in case you need to build a docker image locally.
 
+If there are changes upstream (in the dark-classic repo), you can copy them here
+with `./clone-from-dark-repo.sh`.

build

@@ -9,5 +9,5 @@ gid="$(id -g)"
 # Below is max($gid, 1000); on OS X, the user's group might be staff, with
 # gid=20, which conflicts with ubuntu group dialout.
 gid=$((gid > 1000 ? gid : 1000))
-docker build -t dark --build-arg uid="$(id -u)" --build-arg gid="$gid" .
+docker build -t dark-classic --build-arg uid="$(id -u)" --build-arg gid="$gid" .
 

clone-from-dark-repo.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# run like
+# ./clone-from-dark-repo.sh "../classic-dark"
+
+set -euo pipefail
+
+set -x 
+
+dir=$1
+
+mkdir -p scripts/installers
+
+cp "$dir"/Dockerfile ./