Merge pull request #68 from perldoc-jp/revert-67-revert-66-revert-65-fence

Revert "markdownのFencedCodeに対応する"

Author: kfly8

.github/workflows/test.yml

@@ -15,5 +15,5 @@ jobs:
 
     - name: Run test
       run: |
-        make ci
+        make test
 

.github/workflows/update-cpanfile-snapshot.yml

@@ -6,23 +6,27 @@ RUN apt-get update && \
   apt-get -y upgrade && \
   apt-get install -y wget gcc g++ make sqlite3
 
-RUN cpm install -g Carton
-
 WORKDIR /usr/src/app
 
-COPY cpanfile cpanfile.snapshot .
+COPY cpanfile ./
+RUN cpm install
+COPY . .
+
+RUN sqlite3 perldocjp.master.db < sql/sqlite.sql
+RUN cp perldocjp.master.db perldocjp.slave.db
 
 ENV PLACK_ENV=docker
 ENV PERL5LIB=/usr/src/app/local/lib/perl5
 ENV PATH=/usr/src/app/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
+# 翻訳データの更新
+RUN perl script/update.pl
 
-FROM base as app
-
-RUN carton install --deployment
-COPY . .
-
-RUN sqlite3 perldocjp.master.db < sql/sqlite.sql
-RUN cp perldocjp.master.db perldocjp.slave.db
 
+# テスト用のステージ
+FROM base as test
+RUN cpm install --with-test --with-develop --show-build-log-on-failure
 
+# サーバーを起動したい時のステージ
+FROM base as web
+CMD ["./local/bin/plackup", "-p", "5000", "-Ilib", "app.psgi"]

Dockerfile

@@ -1,30 +1,18 @@
 
 .PHONY: build
 build:
-	docker compose build
+	docker-compose -f docker-compose.yml build web
 
 .PHONY: up
 up:
-	docker compose up
+	make build
+	docker-compose -f docker-compose.yml up -d web
 
 .PHONY: down
 down:
-	docker compose down
+	docker-compose -f docker-compose.yml down
 
 .PHONY: test
-test: TEST_TARGET = t
 test:
-	docker compose exec app prove -lrv $(TEST_TARGET)
-
-.PHONY: ci
-ci:
-	docker compose up -d
-	make setup-data
-	make test
-
-# 翻訳データのセットアップ
-# TODO: 翻訳データのセットアップは他にもあるので、全部ひとまとめにできると良さそう
-.PHONY: setup-data
-setup-data:
-	docker compose exec app perl script/update.pl
-
+	docker-compose -f docker-compose.yml build test
+	docker-compose -f docker-compose.yml run   test prove -Ilib -r -v t

Makefile

@@ -18,7 +18,7 @@ requires 'DBIx::TransactionManager';
 requires 'Regexp::Common';
 requires 'Regexp::Assemble';
 requires 'Text::Diff::FormattedHTML';
-requires 'Text::Markdown::Discount';
+requires 'Text::Markdown';
 requires 'SQL::Interp';
 requires 'Carp::Clan';
 requires 'JSON';
@@ -39,5 +39,4 @@ requires 'Log::Minimal';
 on 'test' => sub {
     requires 'Test2::V0';
     requires 'Test::WWW::Mechanize::PSGI';
-    requires 'Unicode::GCString';
 };