Updates

Author: Darren Govoni

Dockerfile

@@ -1 +1,32 @@
-# creates the CLI container
+FROM python:3.12
+
+RUN apt-get update
+
+WORKDIR /opt/pyfi
+
+ENV TZ=America/New_York
+
+ADD requirements.txt /opt/pyfi/requirements.txt
+ADD setup.py /opt/pyfi/setup.py
+ADD README.md /opt/pyfi/README.md
+ADD conf/pyfi.ini /opt/pyfi/pyfi.ini
+ADD conf/pyfi.ini /root/pyfi.ini
+ADD conf/pyfi.ini /home/pyfi/pyfi.ini
+ADD pyfi.polar /root/pyfi.polar
+
+RUN pip3 install virtualenv
+
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
+
+RUN useradd pyfi -d /home/pyfi
+RUN chown -R pyfi /opt/pyfi /home/pyfi
+RUN virtualenv --python=python3 venv
+RUN venv/bin/python -m pip install --upgrade pip
+RUN venv/bin/pip uninstall -y setuptools
+RUN venv/bin/pip install setuptools==59.1.1
+#RUN venv/bin/pip install --upgrade flask
+RUN venv/bin/pip install -r requirements.txt
+RUN venv/bin/pip uninstall -y pytz
+RUN venv/bin/python setup.py install
+

Makefile

@@ -1,35 +1,19 @@
-.DEFAULT_GOAL := all
-
-.PHONY: format
-format:
-	eslint --fix "src/**/*.{js,vue}"
 
-.PHONY: lint
-lint:
-	eslint "src/**/*.{js,vue}"
+.DEFAULT_GOAL := all
 
 .PHONY: clean
 clean:
 	@echo "Cleaning"
+	docker ps -a|grep -v CONTAINER|awk '{ print "docker stop "$1}'| true | sh 2> /dev/null
+	docker ps -a|grep -v CONTAINER|awk '{ print "docker rm "$1}'| true | sh 2> /dev/null
 
-.PHONY: docs
-docs:
-	make -C docs html
+.PHONY: up
+up:
+	docker compose up
 
 .PHONY: build
 build:
-	. venv/bin/activate && ( \
-        python setup.py install ; \
-        )
-
-.PHONY: install
-install:
-	. venv/bin/activate && ( \
-        pip install -r requirements.txt ; \
-        python setup.py install ; \
-        python setup.py clean \
-        )
+	docker buildx bake
 
 .PHONY: all
-all: clean lint format build
-	git status
+all: clean build

docker-compose.yml

@@ -0,0 +1,9 @@
+version: '3.9'
+
+services:
+
+  cli:
+    image: elasticcode.ai/cli:local
+    container_name: cli
+    build:
+      context: .